Merge remote-tracking branch 'upstream/main' into w2p-101127_browse-by-controlled-vocabulary-7.6.0-next

Conflicts:
	src/app/browse-by/browse-by-guard.spec.ts
	src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
	src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts

src/app/shared/testing/form-event.stub.ts

@@ -1,4 +1,4 @@
-import { FormControl, FormGroup } from '@angular/forms';
+import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 import { DynamicCheckboxModel, DynamicSelectModel } from '@ng-dynamic-forms/core';
 
 export const accessConditionChangeEvent = {
@@ -16,7 +16,7 @@ export const accessConditionChangeEvent = {
         type: 'change',
     },
     context: null,
-    control: new FormControl({
+    control: new UntypedFormControl({
         errors: null,
         pristine: false,
         status: 'VALID',
@@ -26,7 +26,7 @@ export const accessConditionChangeEvent = {
         valueChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
         _updateOn: 'change',
     }),
-    group: new FormGroup({}),
+    group: new UntypedFormGroup({}),
     model: new DynamicSelectModel({
         additional: null,
         asyncValidators: null,
@@ -66,7 +66,7 @@ export const checkboxChangeEvent = {
         type: 'change',
     },
     context: null,
-    control: new FormControl({
+    control: new UntypedFormControl({
         errors: null,
         pristine: false,
         status: 'VALID',
@@ -76,7 +76,7 @@ export const checkboxChangeEvent = {
         valueChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
         _updateOn: 'change',
     }),
-    group: new FormGroup({}),
+    group: new UntypedFormGroup({}),
     model: new DynamicCheckboxModel({
         additional: null,
         asyncValidators: null,

src/app/shared/testing/utils.test.ts

@@ -72,7 +72,7 @@ export function createPaginatedList<T>(objects?: T[]): PaginatedList<T> {
  * @param prop The property/function to spy on
  */
 export function spyOnExported<T>(target: T, prop: keyof T): jasmine.Spy {
-  const spy = jasmine.createSpy(`${prop}Spy`);
+  const spy = jasmine.createSpy(`${String(prop)}Spy`);
   spyOnProperty(target, prop).and.returnValue(spy);
   return spy;
 }