[CST-19328] align with main, solve conflicts

Author: Andrea Barbasso

src/app/shared/metadata.directive.spec.ts

@@ -8,7 +8,6 @@ import { MetadataValue } from '../core/shared/metadata.models';
 import { MetadataDirective } from './metadata.directive';
 
 @Component({
-  standalone: true,
   imports: [
     MetadataDirective,
   ],

src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts

@@ -68,8 +68,8 @@ export class ItemDetailPreviewFieldComponent {
    * @returns {MetadataValue[]} the matching values or an empty array.
    */
   allMetadata(keyOrKeys: string | string[]): MetadataValue[] {
-    const dsoMetadata: MetadataValue[] = Metadata.all([this.item.metadata], keyOrKeys);
-    const highlights: MetadataValue[] = Metadata.all([this.object.hitHighlights], keyOrKeys);
+    const dsoMetadata: MetadataValue[] = Metadata.all(this.item.metadata, keyOrKeys);
+    const highlights: MetadataValue[] = Metadata.all(this.object.hitHighlights, keyOrKeys);
     const removedHighlights: string[] = highlights.map(mv => mv.value.replace(/<\/?em>/g, ''));
     for (let i = 0; i < removedHighlights.length; i++) {
       const index = dsoMetadata.findIndex(mv => mv.value === removedHighlights[i]);

src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts

@@ -40,8 +40,8 @@ export class SearchResultDetailElementComponent<T extends SearchResult<K>, K ext
    * @returns {MetadataValue[]} the matching values or an empty array.
    */
   allMetadata(keyOrKeys: string | string[]): MetadataValue[] {
-    const dsoMetadata: MetadataValue[] = Metadata.all([this.dso.metadata], keyOrKeys);
-    const highlights: MetadataValue[] = Metadata.all([this.object.hitHighlights], keyOrKeys);
+    const dsoMetadata: MetadataValue[] = Metadata.all(this.dso.metadata, keyOrKeys);
+    const highlights: MetadataValue[] = Metadata.all(this.object.hitHighlights, keyOrKeys);
     const removedHighlights: string[] = highlights.map(mv => mv.value.replace(/<\/?em>/g, ''));
     for (let i = 0; i < removedHighlights.length; i++) {
       const index = dsoMetadata.findIndex(mv => mv.value === removedHighlights[i]);
@@ -70,7 +70,7 @@ export class SearchResultDetailElementComponent<T extends SearchResult<K>, K ext
    * @returns {MetadataValue} the first matching value, or `undefined`.
    */
   firstMetadata(keyOrKeys: string | string[]): MetadataValue {
-    return Metadata.first([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
+    return Metadata.first(this.dso.metadata, keyOrKeys, this.object.hitHighlights);
   }
 
   /**

src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts

@@ -54,8 +54,8 @@ export class SearchResultGridElementComponent<T extends SearchResult<K>, K exten
    * @returns {MetadataValue[]} the matching values or an empty array.
    */
   allMetadata(keyOrKeys: string | string[]): MetadataValue[] {
-    const dsoMetadata: MetadataValue[] = Metadata.all([this.dso.metadata], keyOrKeys);
-    const highlights: MetadataValue[] = Metadata.all([this.object.hitHighlights], keyOrKeys);
+    const dsoMetadata: MetadataValue[] = Metadata.all(this.dso.metadata, keyOrKeys);
+    const highlights: MetadataValue[] = Metadata.all(this.object.hitHighlights, keyOrKeys);
     const removedHighlights: string[] = highlights.map(mv => mv.value.replace(/<\/?em>/g, ''));
     for (let i = 0; i < removedHighlights.length; i++) {
       const index = dsoMetadata.findIndex(mv => mv.value === removedHighlights[i]);
@@ -84,7 +84,7 @@ export class SearchResultGridElementComponent<T extends SearchResult<K>, K exten
    * @returns {MetadataValue} the first matching value, or `undefined`.
    */
   firstMetadata(keyOrKeys: string | string[]): MetadataValue {
-    return Metadata.first([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
+    return Metadata.first(this.dso.metadata, keyOrKeys, this.object.hitHighlights);
   }
 
   /**

src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts

@@ -52,8 +52,8 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
    * @returns {MetadataValue[]} the matching values or an empty array.
    */
   allMetadata(keyOrKeys: string | string[]): MetadataValue[] {
-    const dsoMetadata: MetadataValue[] = Metadata.all([this.dso.metadata], keyOrKeys);
-    const highlights: MetadataValue[] = Metadata.all([this.object.hitHighlights], keyOrKeys);
+    const dsoMetadata: MetadataValue[] = Metadata.all(this.dso.metadata, keyOrKeys);
+    const highlights: MetadataValue[] = Metadata.all(this.object.hitHighlights, keyOrKeys);
     const removedHighlights: string[] = highlights.map(mv => mv.value.replace(/<\/?em>/g, ''));
     for (let i = 0; i < removedHighlights.length; i++) {
       const index = dsoMetadata.findIndex(mv => mv.value === removedHighlights[i]);
@@ -92,7 +92,7 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
    * @returns {MetadataValue} the first matching value, or `undefined`.
    */
   firstMetadata(keyOrKeys: string | string[]): MetadataValue {
-    return Metadata.first([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
+    return Metadata.first(this.dso.metadata, keyOrKeys, this.object.hitHighlights);
   }
 
   /**