{{ "item.page.filesection.description" | translate }}
-
- {{ file.firstMetadataValue("dc.description") }}
+
}
@@ -86,8 +85,7 @@
{{ "item.page.filesection.description" | translate }}
-
- {{ file.firstMetadataValue("dc.description") }}
+
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 630046f6726..bbd52be85c2 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
@@ -35,6 +35,7 @@ import {
} from 'rxjs/operators';
import { ThemedFileDownloadLinkComponent } from '../../../../shared/file-download-link/themed-file-download-link.component';
+import { MetadataDirective } from '../../../../shared/metadata.directive';
import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
@@ -54,6 +55,7 @@ import { FileSectionComponent } from '../../../simple/field-components/file-sect
imports: [
AsyncPipe,
FileSizePipe,
+ MetadataDirective,
MetadataFieldWrapperComponent,
PaginationComponent,
ThemedFileDownloadLinkComponent,
diff --git a/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts b/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts
index ba62f328fbf..593b38ae72b 100644
--- a/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts
+++ b/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts
@@ -36,6 +36,10 @@ class TestType implements MetadataRepresentation {
getValue(): string {
return '';
}
+
+ getLanguage(): string {
+ return '';
+ }
}
describe('MetadataRepresentationLoaderComponent', () => {
diff --git a/src/app/shared/metadata.directive.spec.ts b/src/app/shared/metadata.directive.spec.ts
new file mode 100644
index 00000000000..a5be5d4a528
--- /dev/null
+++ b/src/app/shared/metadata.directive.spec.ts
@@ -0,0 +1,99 @@
+import { Component } from '@angular/core';
+import {
+ ComponentFixture,
+ TestBed,
+} from '@angular/core/testing';
+
+import { MetadataValue } from '../core/shared/metadata.models';
+import { MetadataDirective } from './metadata.directive';
+
+@Component({
+ standalone: true,
+ imports: [
+ MetadataDirective,
+ ],
+ template: `
+
+ `,
+})
+class HostComponent {
+ mv?: MetadataValue | null;
+}
+
+describe('MetadataDirective', () => {
+ let fixture: ComponentFixture;
+ let host: HostComponent;
+ let span: HTMLSpanElement;
+
+ function createMetadata(value?: string, language?: string): MetadataValue {
+ return {
+ uuid: '123',
+ value: value,
+ language: language,
+ place: undefined,
+ authority: undefined,
+ confidence: undefined,
+ } as MetadataValue;
+ }
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [HostComponent],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(HostComponent);
+ host = fixture.componentInstance;
+ fixture.detectChanges();
+ span = fixture.nativeElement.querySelector('span');
+ });
+
+ it('is empty and has no lang by default', () => {
+ expect(span.innerHTML).toBe('');
+ expect(span.hasAttribute('lang')).toBeFalse();
+ });
+
+ it('renders value and lang when metadata provided', () => {
+ host.mv = createMetadata('Hello', 'en');
+ fixture.detectChanges();
+ expect(span.innerHTML).toBe('Hello');
+ expect(span.getAttribute('lang')).toBe('en');
+ });
+
+ it('updates value and lang when metadata changes', () => {
+ host.mv = createMetadata('First', 'en');
+ fixture.detectChanges();
+ host.mv = createMetadata('Deuxième', 'fr');
+ fixture.detectChanges();
+ expect(span.innerHTML).toBe('Deuxième');
+ expect(span.getAttribute('lang')).toBe('fr');
+ });
+
+ it('clears content and lang when metadata set to null', () => {
+ host.mv = createMetadata('Hello', 'en');
+ fixture.detectChanges();
+ host.mv = null;
+ fixture.detectChanges();
+ expect(span.innerHTML).toBe('');
+ expect(span.hasAttribute('lang')).toBeFalse();
+ });
+
+ it('removes lang attribute when language missing', () => {
+ host.mv = createMetadata('Value', undefined);
+ fixture.detectChanges();
+ expect(span.innerHTML).toBe('Value');
+ expect(span.hasAttribute('lang')).toBeFalse();
+ });
+
+ it('renders empty string when value is undefined', () => {
+ host.mv = createMetadata(undefined, 'en');
+ fixture.detectChanges();
+ expect(span.innerHTML).toBe('');
+ expect(span.getAttribute('lang')).toBe('en');
+ });
+
+ it('sets innerHTML allowing markup', () => {
+ host.mv = createMetadata('Italic', 'en');
+ fixture.detectChanges();
+ expect(span.innerHTML.toLowerCase()).toBe('italic');
+ });
+});
diff --git a/src/app/shared/metadata.directive.ts b/src/app/shared/metadata.directive.ts
new file mode 100644
index 00000000000..468033a4543
--- /dev/null
+++ b/src/app/shared/metadata.directive.ts
@@ -0,0 +1,75 @@
+import {
+ Directive,
+ ElementRef,
+ inject,
+ Input,
+ Renderer2,
+} from '@angular/core';
+
+import { MetadataValue } from '../core/shared/metadata.models';
+import { normalizeLanguageCode } from './utils/normalize-language-code-utils';
+
+/**
+ * A directive that sets the innerHTML and lang attribute of the host element
+ * based on the provided `MetadataValue`.
+ *
+ * - The `innerHTML` is set to the `value` property of the `MetadataValue`.
+ * - The `lang` attribute is set to the `language` property of the `MetadataValue`.
+ * - If the `MetadataValue` is null or undefined, the `innerHTML` is cleared and the `lang` attribute is removed.
+ */
+@Directive({
+ selector: '[dsMetadata]',
+ standalone: true,
+})
+export class MetadataDirective {
+ /**
+ * Stores the current `MetadataValue` provided to the directive.
+ */
+ private _metadataValue?: MetadataValue;
+
+ /**
+ * Reference to the host DOM element.
+ */
+ private el = inject(ElementRef);
+
+ /**
+ * Angular Renderer2 instance for safely manipulating the DOM.
+ */
+ private renderer = inject(Renderer2);
+
+ /**
+ * Input property for the directive. Accepts a `MetadataValue` object.
+ * When set, it updates the host element's `innerHTML` and `lang` attribute.
+ *
+ * @param value - The `MetadataValue` object containing the `value` and `language`.
+ */
+ @Input() set dsMetadata(value: MetadataValue | null | undefined) {
+ this._metadataValue = value ?? undefined;
+ this.updateHost();
+ }
+
+ /**
+ * Updates the host element's `innerHTML` and `lang` attribute based on the current `MetadataValue`.
+ * - If `MetadataValue` is provided:
+ * - Sets `innerHTML` to `MetadataValue.value` (or an empty string if `value` is null/undefined).
+ * - Sets the `lang` attribute to `MetadataValue.language` (or removes it if `language` is null/undefined).
+ * - If `MetadataValue` is null/undefined:
+ * - Clears the `innerHTML`.
+ * - Removes the `lang` attribute.
+ */
+ private updateHost(): void {
+ if (this._metadataValue) {
+ const val = this._metadataValue.value ?? '';
+ this.renderer.setProperty(this.el.nativeElement, 'innerHTML', val);
+ if (this._metadataValue.language) {
+ const normalizedLang = normalizeLanguageCode(this._metadataValue.language);
+ this.renderer.setAttribute(this.el.nativeElement, 'lang', normalizedLang);
+ } else {
+ this.renderer.removeAttribute(this.el.nativeElement, 'lang');
+ }
+ } else {
+ this.renderer.setProperty(this.el.nativeElement, 'innerHTML', '');
+ this.renderer.removeAttribute(this.el.nativeElement, 'lang');
+ }
+ }
+}
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 0fa8da1f72c..4cc42d0e572 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,14 +1,13 @@
@if (item.hasMetadata(metadata)) {
- @for (mdValue of allMetadataValues(metadata); track mdValue; let last = $last) {
-
- {{mdValue}}@if (!last) {
+ @for (mdValue of allMetadata(metadata); track mdValue; let last = $last) {
+
+ @if (!last) {
}
-
+ }
+ }
+ @if (!item.hasMetadata(metadata)) {
+ {{ (placeholder | translate) }}
}
-}
-@if (!item.hasMetadata(metadata)) {
- {{(placeholder | translate)}}
-}
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 5bedcf59c7f..6bd6610b6c2 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,4 +1,3 @@
-
import {
Component,
Input,
@@ -8,6 +7,8 @@ import { Metadata } from '@dspace/core/shared/metadata.utils';
import { SearchResult } from '@dspace/core/shared/search/models/search-result.model';
import { TranslateModule } from '@ngx-translate/core';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { MetadataDirective } from '../../../../metadata.directive';
import { MetadataFieldWrapperComponent } from '../../../../metadata-field-wrapper/metadata-field-wrapper.component';
/**
@@ -18,6 +19,7 @@ import { MetadataFieldWrapperComponent } from '../../../../metadata-field-wrappe
templateUrl: './item-detail-preview-field.component.html',
standalone: true,
imports: [
+ MetadataDirective,
MetadataFieldWrapperComponent,
TranslateModule,
],
@@ -54,6 +56,26 @@ export class ItemDetailPreviewFieldComponent {
*/
@Input() separator: string;
+
+ /**
+ * Gets all matching metadata values from hitHighlights or dso metadata.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @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 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]);
+ if (index !== -1) {
+ dsoMetadata[index] = highlights[i];
+ }
+ }
+ return dsoMetadata;
+ }
+
/**
* Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights.
*
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts
index 9f7dd50532a..7a000ba0697 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts
@@ -7,6 +7,7 @@ import { Metadata } from '@dspace/core/shared/metadata.utils';
import { SearchResult } from '@dspace/core/shared/search/models/search-result.model';
import { hasValue } from '@dspace/shared/utils/empty.util';
+import { MetadataValue } from '../../../core/shared/metadata.models';
import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
/**
@@ -33,6 +34,25 @@ export class SearchResultDetailElementComponent, K ext
}
}
+ /**
+ * Gets all matching metadata values from hitHighlights or dso metadata.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @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 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]);
+ if (index !== -1) {
+ dsoMetadata[index] = highlights[i];
+ }
+ }
+ return dsoMetadata;
+ }
+
/**
* Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights.
*
@@ -43,6 +63,16 @@ export class SearchResultDetailElementComponent, K ext
return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
}
+ /**
+ * Gets the first matching metadata value from hitHighlights or dso metadata, preferring hitHighlights.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @returns {MetadataValue} the first matching value, or `undefined`.
+ */
+ firstMetadata(keyOrKeys: string | string[]): MetadataValue {
+ return Metadata.first([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
+ }
+
/**
* Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights.
*
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 6acfa839f09..e30b436e6ed 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
@@ -30,12 +30,12 @@
@if (dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])) {
@@ -44,7 +44,7 @@
@if (dso.hasMetadata('dc.description.abstract')) {
-
+
}
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 8498d6d32d3..108b389715c 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
@@ -14,6 +14,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
import { focusShadow } from '../../../../animations/focus';
+import { MetadataDirective } from '../../../../metadata.directive';
import { ThemedBadgesComponent } from '../../../../object-collection/shared/badges/themed-badges.component';
import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
import { TruncatableComponent } from '../../../../truncatable/truncatable.component';
@@ -31,6 +32,7 @@ import { SearchResultGridElementComponent } from '../../search-result-grid-eleme
standalone: true,
imports: [
AsyncPipe,
+ MetadataDirective,
RouterLink,
ThemedBadgesComponent,
ThemedThumbnailComponent,
diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
index ab7331ef235..0e09610cdd7 100644
--- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
@@ -5,6 +5,7 @@ import {
import { DSONameService } from '@dspace/core/breadcrumbs/dso-name.service';
import { BitstreamDataService } from '@dspace/core/data/bitstream-data.service';
import { DSpaceObject } from '@dspace/core/shared/dspace-object.model';
+import { MetadataValue } from '@dspace/core/shared/metadata.models';
import { Metadata } from '@dspace/core/shared/metadata.utils';
import { SearchResult } from '@dspace/core/shared/search/models/search-result.model';
import { hasValue } from '@dspace/shared/utils/empty.util';
@@ -47,6 +48,25 @@ export class SearchResultGridElementComponent, K exten
}
}
+ /**
+ * Gets all matching metadata values from hitHighlights or dso metadata.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @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 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]);
+ if (index !== -1) {
+ dsoMetadata[index] = highlights[i];
+ }
+ }
+ return dsoMetadata;
+ }
+
/**
* Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights.
*
@@ -57,6 +77,16 @@ export class SearchResultGridElementComponent, K exten
return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
}
+ /**
+ * Gets the first matching metadata value from hitHighlights or dso metadata, preferring hitHighlights.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @returns {MetadataValue} the first matching value, or `undefined`.
+ */
+ firstMetadata(keyOrKeys: string | string[]): MetadataValue {
+ return Metadata.first([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
+ }
+
/**
* Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights.
*
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 7777f0d26fd..96276a3eb0b 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
@@ -3,6 +3,7 @@
{{mdRepresentation.getValue()}}
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 4a5691c1760..9e63583d618 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
@@ -66,6 +66,22 @@ describe('BrowseLinkMetadataListElementComponent', () => {
it('should NOT match isLink', () => {
expect(comp.isLink()).toBe(false);
});
+
+ it('should set lang attribute when language is provided', () => {
+ (comp.mdRepresentation as any).language = 'en';
+ fixture.detectChanges();
+ const anchor: HTMLAnchorElement = fixture.debugElement.nativeElement.querySelector('a');
+ expect(anchor.getAttribute('lang')).toBe('en');
+ });
+
+ it('should remove lang attribute when language becomes undefined', () => {
+ (comp.mdRepresentation as any).language = 'fr';
+ fixture.detectChanges();
+ (comp.mdRepresentation as any).language = undefined;
+ fixture.detectChanges();
+ const anchor: HTMLAnchorElement = fixture.debugElement.nativeElement.querySelector('a');
+ expect(anchor.getAttribute('lang')).toBeNull();
+ });
});
describe('with metadata with an url', () => {
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 cdeef118b57..f277353565e 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
@@ -3,6 +3,7 @@ import { Component } from '@angular/core';
import { RouterLink } from '@angular/router';
import { VALUE_LIST_BROWSE_DEFINITION } from '@dspace/core/shared/value-list-browse-definition.resource-type';
+import { NormalizeLanguageCodePipe } from '../../../utils/normalize-language-code.pipe';
import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
@Component({
@@ -10,6 +11,7 @@ import { MetadataRepresentationListElementComponent } from '../metadata-represen
templateUrl: './browse-link-metadata-list-element.component.html',
standalone: true,
imports: [
+ NormalizeLanguageCodePipe,
RouterLink,
],
})
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 8c550d0276a..13c8769e370 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,18 +1,19 @@
@if ((mdRepresentation.representationType==='plain_text') && !isLink()) {
-
+
{{mdRepresentation.getValue()}}
}
@if ((mdRepresentation.representationType==='plain_text') && isLink()) {
{{mdRepresentation.getValue()}}
}
@if ((mdRepresentation.representationType==='authority_controlled')) {
- {{mdRepresentation.getValue()}}
+ {{mdRepresentation.getValue()}}
}
@if ((mdRepresentation.representationType==='browse_link')) {
{{mdRepresentation.getValue()}}
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
index 6f386e3cc0b..1d1c85d8f5d 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
@@ -51,4 +51,20 @@ describe('PlainTextMetadataListElementComponent', () => {
expect(fixture.debugElement.query(By.css('a.ds-browse-link')).nativeElement.innerHTML).toContain(mockMetadataRepresentation.value);
});
+ it('should set lang attribute when language is provided', () => {
+ (comp.mdRepresentation as any).language = 'en';
+ fixture.detectChanges();
+ const el: HTMLElement = fixture.debugElement.nativeElement.querySelector('.dont-break-out');
+ expect(el.getAttribute('lang')).toBe('en');
+ });
+
+ it('should remove lang attribute when language becomes undefined', () => {
+ (comp.mdRepresentation as any).language = 'fr';
+ fixture.detectChanges();
+ (comp.mdRepresentation as any).language = undefined;
+ fixture.detectChanges();
+ const el: HTMLElement = fixture.debugElement.nativeElement.querySelector('.dont-break-out');
+ expect(el.getAttribute('lang')).toBeNull();
+ });
+
});
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 55255bf205e..33673ee5ff3 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
@@ -3,6 +3,7 @@ import { Component } from '@angular/core';
import { RouterLink } from '@angular/router';
import { VALUE_LIST_BROWSE_DEFINITION } from '@dspace/core/shared/value-list-browse-definition.resource-type';
+import { NormalizeLanguageCodePipe } from '../../../utils/normalize-language-code.pipe';
import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
@Component({
@@ -10,6 +11,7 @@ import { MetadataRepresentationListElementComponent } from '../metadata-represen
templateUrl: './plain-text-metadata-list-element.component.html',
standalone: true,
imports: [
+ NormalizeLanguageCodePipe,
RouterLink,
],
})
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 b005af46ec3..fef888d9caf 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
@@ -18,22 +18,25 @@
(@if (item.hasMetadata('dc.publisher')) {
+ [dsMetadata]="item.firstMetadata('dc.publisher')">
,
}
- )
- @if (item.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);) {
+ @if (item.hasMetadata('dc.date.issued')) {
+
+ } @else {
+ {{ 'mydspace.results.no-date' | translate }}
+ })
+ @if (item.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);) {
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 fedd214e5ff..5aa3038261c 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
@@ -21,6 +21,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail.component';
import { fadeInOut } from '../../../animations/fade';
+import { MetadataDirective } from '../../../metadata.directive';
import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component';
import { ItemCollectionComponent } from '../../../object-collection/shared/mydspace-item-collection/item-collection.component';
import { ItemSubmitterComponent } from '../../../object-collection/shared/mydspace-item-submitter/item-submitter.component';
@@ -40,6 +41,7 @@ import { TruncatablePartComponent } from '../../../truncatable/truncatable-part/
AsyncPipe,
ItemCollectionComponent,
ItemSubmitterComponent,
+ MetadataDirective,
NgClass,
ThemedBadgesComponent,
ThemedThumbnailComponent,
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 c506050ece7..b92d56f8e8e 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
@@ -10,7 +10,7 @@
}
@if (dso.shortDescription) {
-
+
}
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 d2e0223a4e4..922e39a3ac2 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
@@ -8,6 +8,7 @@ import { Collection } from '@dspace/core/shared/collection.model';
import { CollectionSearchResult } from '@dspace/core/shared/object-collection/collection-search-result.model';
import { ViewMode } from '@dspace/core/shared/view-mode.model';
+import { MetadataDirective } from '../../../metadata.directive';
import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component';
import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
import { SearchResultListElementComponent } from '../search-result-list-element.component';
@@ -18,6 +19,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
templateUrl: 'collection-search-result-list-element.component.html',
standalone: true,
imports: [
+ MetadataDirective,
NgClass,
RouterLink,
ThemedBadgesComponent,
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 392a369efbd..b435806aabc 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
@@ -10,7 +10,7 @@
}
@if (dso.shortDescription) {
-
+
}
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 97a7fbc65ee..441e645196a 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
@@ -8,6 +8,7 @@ import { Community } from '@dspace/core/shared/community.model';
import { CommunitySearchResult } from '@dspace/core/shared/object-collection/community-search-result.model';
import { ViewMode } from '@dspace/core/shared/view-mode.model';
+import { MetadataDirective } from '../../../metadata.directive';
import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component';
import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
import { SearchResultListElementComponent } from '../search-result-list-element.component';
@@ -18,6 +19,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
templateUrl: 'community-search-result-list-element.component.html',
standalone: true,
imports: [
+ MetadataDirective,
NgClass,
RouterLink,
ThemedBadgesComponent,
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 53ef93bc54c..065c4dfe436 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
@@ -38,20 +38,20 @@
@if (dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')) {
(@if (dso.firstMetadataValue('dc.publisher')) {
-
+
}
@if (dso.firstMetadataValue('dc.publisher') && dso.firstMetadataValue('dc.date.issued')) {
,
}
@if (dso.firstMetadataValue('dc.date.issued')) {
-
+
})
}
@if (dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0) {
}
- @if (selectItem.dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])) {
- {{selectItem.dso.firstMetadataValue(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])}}
- }
+
+ @if (selectItem.dso.firstMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); as author) {
+
+ }
+
{{ dsoNameService.getName(selectItem.dso) }}
}
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 bcef84011f0..9d0e666e4ba 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
@@ -24,6 +24,7 @@ import { map } from 'rxjs/operators';
import { BtnDisabledDirective } from '../../btn-disabled.directive';
import { ErrorComponent } from '../../error/error.component';
import { ThemedLoadingComponent } from '../../loading/themed-loading.component';
+import { MetadataDirective } from '../../metadata.directive';
import { PaginationComponent } from '../../pagination/pagination.component';
import { VarDirective } from '../../utils/var.directive';
import { DSpaceObjectSelect } from '../object-select.model';
@@ -38,6 +39,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
BtnDisabledDirective,
ErrorComponent,
FormsModule,
+ MetadataDirective,
NgClass,
PaginationComponent,
RouterLink,
diff --git a/src/app/shared/utils/normalize-language-code-utils.ts b/src/app/shared/utils/normalize-language-code-utils.ts
new file mode 100644
index 00000000000..79a6497ba83
--- /dev/null
+++ b/src/app/shared/utils/normalize-language-code-utils.ts
@@ -0,0 +1,15 @@
+/**
+ * Normalizes a language code by replacing underscores with hyphens.
+ *
+ * This function is useful for transforming POSIX-style language codes (e.g., 'en_US') into
+ * standard BCP 47 language tags (e.g., 'en-US').
+ *
+ * @param value - The input string to be transformed. Can be null or undefined.
+ * @returns The transformed string with underscores replaced by dashes, or the original value if null/undefined.
+ */
+export function normalizeLanguageCode(value: string | null | undefined): string | null | undefined {
+ if (value === null || value === undefined) {
+ return value;
+ }
+ return value.replace(/_/g, '-');
+}
diff --git a/src/app/shared/utils/normalize-language-code.pipe.spec.ts b/src/app/shared/utils/normalize-language-code.pipe.spec.ts
new file mode 100644
index 00000000000..b89b9b3ba43
--- /dev/null
+++ b/src/app/shared/utils/normalize-language-code.pipe.spec.ts
@@ -0,0 +1,25 @@
+import { NormalizeLanguageCodePipe } from './normalize-language-code.pipe';
+
+describe('NormalizeLanguageCodePipe', () => {
+ const pipe = new NormalizeLanguageCodePipe();
+
+ it('transforms language codes replacing underscores with dashes', () => {
+ expect(pipe.transform('en_US')).toBe('en-US');
+ expect(pipe.transform('pt_BR')).toBe('pt-BR');
+ expect(pipe.transform('zh_Hant_TW')).toBe('zh-Hant-TW');
+ });
+
+ it('returns the same value when there are no underscores', () => {
+ expect(pipe.transform('en')).toBe('en');
+ expect(pipe.transform('fr')).toBe('fr');
+ });
+
+ it('preserves null and undefined input', () => {
+ expect(pipe.transform(null)).toBeNull();
+ expect(pipe.transform(undefined)).toBeUndefined();
+ });
+
+ it('handles empty string input', () => {
+ expect(pipe.transform('')).toBe('');
+ });
+});
diff --git a/src/app/shared/utils/normalize-language-code.pipe.ts b/src/app/shared/utils/normalize-language-code.pipe.ts
new file mode 100644
index 00000000000..ec3ff4ed730
--- /dev/null
+++ b/src/app/shared/utils/normalize-language-code.pipe.ts
@@ -0,0 +1,31 @@
+import {
+ Pipe,
+ PipeTransform,
+} from '@angular/core';
+
+import { normalizeLanguageCode } from './normalize-language-code-utils';
+
+/**
+ * A custom Angular pipe that normalizes language codes by replacing underscores with dashes.
+ *
+ * This pipe is useful for transforming POSIX-style language codes (e.g., 'en_US') into
+ * standard BCP 47 language tags (e.g., 'en-US').
+ *
+ * Example usage in a template:
+ * {{ 'en_US' | dsNormalizeLanguageCode }} -> 'en-US'
+ */
+@Pipe({
+ name: 'dsNormalizeLanguageCode',
+ standalone: true,
+})
+export class NormalizeLanguageCodePipe implements PipeTransform {
+ /**
+ * Transforms the input string by replacing all underscores with dashes.
+ *
+ * @param value - The input string to be transformed. Can be null or undefined.
+ * @returns The transformed string with underscores replaced by dashes, or the original value if null/undefined.
+ */
+ transform(value: string | null | undefined): string | null | undefined {
+ return normalizeLanguageCode(value);
+ }
+}
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 e6b33d0b630..f5c006346ce 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
@@ -4,6 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { FullFileSectionComponent as BaseComponent } from '../../../../../../../app/item-page/full/field-components/file-section/full-file-section.component';
import { ThemedFileDownloadLinkComponent } from '../../../../../../../app/shared/file-download-link/themed-file-download-link.component';
+import { MetadataDirective } from '../../../../../../../app/shared/metadata.directive';
import { MetadataFieldWrapperComponent } from '../../../../../../../app/shared/metadata-field-wrapper/metadata-field-wrapper.component';
import { PaginationComponent } from '../../../../../../../app/shared/pagination/pagination.component';
import { FileSizePipe } from '../../../../../../../app/shared/utils/file-size-pipe';
@@ -20,6 +21,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
imports: [
AsyncPipe,
FileSizePipe,
+ MetadataDirective,
MetadataFieldWrapperComponent,
PaginationComponent,
ThemedFileDownloadLinkComponent,
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 951d10bb3d0..5ca3ee43b04 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,6 +1,7 @@
import { Component } from '@angular/core';
import { TranslateModule } from '@ngx-translate/core';
+import { MetadataDirective } from '../../../../../../../../app/shared/metadata.directive';
import { MetadataFieldWrapperComponent } from '../../../../../../../../app/shared/metadata-field-wrapper/metadata-field-wrapper.component';
import { ItemDetailPreviewFieldComponent as BaseComponent } from '../../../../../../../../app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
@@ -10,6 +11,7 @@ import { ItemDetailPreviewFieldComponent as BaseComponent } from '../../../../..
templateUrl: '../../../../../../../../app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.html',
standalone: true,
imports: [
+ MetadataDirective,
MetadataFieldWrapperComponent,
TranslateModule,
],
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 cf3cbbabe67..a0988cd1d2c 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
@@ -6,6 +6,7 @@ import { Component } from '@angular/core';
import { TranslateModule } from '@ngx-translate/core';
import { fadeInOut } from '../../../../../../../app/shared/animations/fade';
+import { MetadataDirective } from '../../../../../../../app/shared/metadata.directive';
import { ThemedBadgesComponent } from '../../../../../../../app/shared/object-collection/shared/badges/themed-badges.component';
import { ItemCollectionComponent } from '../../../../../../../app/shared/object-collection/shared/mydspace-item-collection/item-collection.component';
import { ItemSubmitterComponent } from '../../../../../../../app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component';
@@ -26,6 +27,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
AsyncPipe,
ItemCollectionComponent,
ItemSubmitterComponent,
+ MetadataDirective,
NgClass,
ThemedBadgesComponent,
ThemedThumbnailComponent,
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 7c890851899..d3a08320053 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
@@ -8,6 +8,7 @@ import { Context } from '@dspace/core/shared/context.model';
import { ItemSearchResult } from '@dspace/core/shared/object-collection/item-search-result.model';
import { ViewMode } from '@dspace/core/shared/view-mode.model';
+import { MetadataDirective } from '../../../../../../../../../app/shared/metadata.directive';
import { ThemedBadgesComponent } from '../../../../../../../../../app/shared/object-collection/shared/badges/themed-badges.component';
import { listableObjectComponent } from '../../../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
import { ItemSearchResultListElementComponent as BaseComponent } from '../../../../../../../../../app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
@@ -26,6 +27,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../../../app/thumbna
standalone: true,
imports: [
AsyncPipe,
+ MetadataDirective,
NgClass,
RouterLink,
ThemedBadgesComponent,
{{ "item.page.filesection.description" | translate }}
-
- {{ file.firstMetadataValue("dc.description") }}
+
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 630046f6726..bbd52be85c2 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
@@ -35,6 +35,7 @@ import {
} from 'rxjs/operators';
import { ThemedFileDownloadLinkComponent } from '../../../../shared/file-download-link/themed-file-download-link.component';
+import { MetadataDirective } from '../../../../shared/metadata.directive';
import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
@@ -54,6 +55,7 @@ import { FileSectionComponent } from '../../../simple/field-components/file-sect
imports: [
AsyncPipe,
FileSizePipe,
+ MetadataDirective,
MetadataFieldWrapperComponent,
PaginationComponent,
ThemedFileDownloadLinkComponent,
diff --git a/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts b/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts
index ba62f328fbf..593b38ae72b 100644
--- a/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts
+++ b/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts
@@ -36,6 +36,10 @@ class TestType implements MetadataRepresentation {
getValue(): string {
return '';
}
+
+ getLanguage(): string {
+ return '';
+ }
}
describe('MetadataRepresentationLoaderComponent', () => {
diff --git a/src/app/shared/metadata.directive.spec.ts b/src/app/shared/metadata.directive.spec.ts
new file mode 100644
index 00000000000..a5be5d4a528
--- /dev/null
+++ b/src/app/shared/metadata.directive.spec.ts
@@ -0,0 +1,99 @@
+import { Component } from '@angular/core';
+import {
+ ComponentFixture,
+ TestBed,
+} from '@angular/core/testing';
+
+import { MetadataValue } from '../core/shared/metadata.models';
+import { MetadataDirective } from './metadata.directive';
+
+@Component({
+ standalone: true,
+ imports: [
+ MetadataDirective,
+ ],
+ template: `
+
+ `,
+})
+class HostComponent {
+ mv?: MetadataValue | null;
+}
+
+describe('MetadataDirective', () => {
+ let fixture: ComponentFixture;
+ let host: HostComponent;
+ let span: HTMLSpanElement;
+
+ function createMetadata(value?: string, language?: string): MetadataValue {
+ return {
+ uuid: '123',
+ value: value,
+ language: language,
+ place: undefined,
+ authority: undefined,
+ confidence: undefined,
+ } as MetadataValue;
+ }
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [HostComponent],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(HostComponent);
+ host = fixture.componentInstance;
+ fixture.detectChanges();
+ span = fixture.nativeElement.querySelector('span');
+ });
+
+ it('is empty and has no lang by default', () => {
+ expect(span.innerHTML).toBe('');
+ expect(span.hasAttribute('lang')).toBeFalse();
+ });
+
+ it('renders value and lang when metadata provided', () => {
+ host.mv = createMetadata('Hello', 'en');
+ fixture.detectChanges();
+ expect(span.innerHTML).toBe('Hello');
+ expect(span.getAttribute('lang')).toBe('en');
+ });
+
+ it('updates value and lang when metadata changes', () => {
+ host.mv = createMetadata('First', 'en');
+ fixture.detectChanges();
+ host.mv = createMetadata('Deuxième', 'fr');
+ fixture.detectChanges();
+ expect(span.innerHTML).toBe('Deuxième');
+ expect(span.getAttribute('lang')).toBe('fr');
+ });
+
+ it('clears content and lang when metadata set to null', () => {
+ host.mv = createMetadata('Hello', 'en');
+ fixture.detectChanges();
+ host.mv = null;
+ fixture.detectChanges();
+ expect(span.innerHTML).toBe('');
+ expect(span.hasAttribute('lang')).toBeFalse();
+ });
+
+ it('removes lang attribute when language missing', () => {
+ host.mv = createMetadata('Value', undefined);
+ fixture.detectChanges();
+ expect(span.innerHTML).toBe('Value');
+ expect(span.hasAttribute('lang')).toBeFalse();
+ });
+
+ it('renders empty string when value is undefined', () => {
+ host.mv = createMetadata(undefined, 'en');
+ fixture.detectChanges();
+ expect(span.innerHTML).toBe('');
+ expect(span.getAttribute('lang')).toBe('en');
+ });
+
+ it('sets innerHTML allowing markup', () => {
+ host.mv = createMetadata('Italic', 'en');
+ fixture.detectChanges();
+ expect(span.innerHTML.toLowerCase()).toBe('italic');
+ });
+});
diff --git a/src/app/shared/metadata.directive.ts b/src/app/shared/metadata.directive.ts
new file mode 100644
index 00000000000..468033a4543
--- /dev/null
+++ b/src/app/shared/metadata.directive.ts
@@ -0,0 +1,75 @@
+import {
+ Directive,
+ ElementRef,
+ inject,
+ Input,
+ Renderer2,
+} from '@angular/core';
+
+import { MetadataValue } from '../core/shared/metadata.models';
+import { normalizeLanguageCode } from './utils/normalize-language-code-utils';
+
+/**
+ * A directive that sets the innerHTML and lang attribute of the host element
+ * based on the provided `MetadataValue`.
+ *
+ * - The `innerHTML` is set to the `value` property of the `MetadataValue`.
+ * - The `lang` attribute is set to the `language` property of the `MetadataValue`.
+ * - If the `MetadataValue` is null or undefined, the `innerHTML` is cleared and the `lang` attribute is removed.
+ */
+@Directive({
+ selector: '[dsMetadata]',
+ standalone: true,
+})
+export class MetadataDirective {
+ /**
+ * Stores the current `MetadataValue` provided to the directive.
+ */
+ private _metadataValue?: MetadataValue;
+
+ /**
+ * Reference to the host DOM element.
+ */
+ private el = inject(ElementRef);
+
+ /**
+ * Angular Renderer2 instance for safely manipulating the DOM.
+ */
+ private renderer = inject(Renderer2);
+
+ /**
+ * Input property for the directive. Accepts a `MetadataValue` object.
+ * When set, it updates the host element's `innerHTML` and `lang` attribute.
+ *
+ * @param value - The `MetadataValue` object containing the `value` and `language`.
+ */
+ @Input() set dsMetadata(value: MetadataValue | null | undefined) {
+ this._metadataValue = value ?? undefined;
+ this.updateHost();
+ }
+
+ /**
+ * Updates the host element's `innerHTML` and `lang` attribute based on the current `MetadataValue`.
+ * - If `MetadataValue` is provided:
+ * - Sets `innerHTML` to `MetadataValue.value` (or an empty string if `value` is null/undefined).
+ * - Sets the `lang` attribute to `MetadataValue.language` (or removes it if `language` is null/undefined).
+ * - If `MetadataValue` is null/undefined:
+ * - Clears the `innerHTML`.
+ * - Removes the `lang` attribute.
+ */
+ private updateHost(): void {
+ if (this._metadataValue) {
+ const val = this._metadataValue.value ?? '';
+ this.renderer.setProperty(this.el.nativeElement, 'innerHTML', val);
+ if (this._metadataValue.language) {
+ const normalizedLang = normalizeLanguageCode(this._metadataValue.language);
+ this.renderer.setAttribute(this.el.nativeElement, 'lang', normalizedLang);
+ } else {
+ this.renderer.removeAttribute(this.el.nativeElement, 'lang');
+ }
+ } else {
+ this.renderer.setProperty(this.el.nativeElement, 'innerHTML', '');
+ this.renderer.removeAttribute(this.el.nativeElement, 'lang');
+ }
+ }
+}
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 0fa8da1f72c..4cc42d0e572 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,14 +1,13 @@
@if (item.hasMetadata(metadata)) {
- @for (mdValue of allMetadataValues(metadata); track mdValue; let last = $last) {
-
- {{mdValue}}@if (!last) {
+ @for (mdValue of allMetadata(metadata); track mdValue; let last = $last) {
+
+ @if (!last) {
}
-
+ }
+ }
+ @if (!item.hasMetadata(metadata)) {
+ {{ (placeholder | translate) }}
}
-}
-@if (!item.hasMetadata(metadata)) {
- {{(placeholder | translate)}}
-}
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 5bedcf59c7f..6bd6610b6c2 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,4 +1,3 @@
-
import {
Component,
Input,
@@ -8,6 +7,8 @@ import { Metadata } from '@dspace/core/shared/metadata.utils';
import { SearchResult } from '@dspace/core/shared/search/models/search-result.model';
import { TranslateModule } from '@ngx-translate/core';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { MetadataDirective } from '../../../../metadata.directive';
import { MetadataFieldWrapperComponent } from '../../../../metadata-field-wrapper/metadata-field-wrapper.component';
/**
@@ -18,6 +19,7 @@ import { MetadataFieldWrapperComponent } from '../../../../metadata-field-wrappe
templateUrl: './item-detail-preview-field.component.html',
standalone: true,
imports: [
+ MetadataDirective,
MetadataFieldWrapperComponent,
TranslateModule,
],
@@ -54,6 +56,26 @@ export class ItemDetailPreviewFieldComponent {
*/
@Input() separator: string;
+
+ /**
+ * Gets all matching metadata values from hitHighlights or dso metadata.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @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 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]);
+ if (index !== -1) {
+ dsoMetadata[index] = highlights[i];
+ }
+ }
+ return dsoMetadata;
+ }
+
/**
* Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights.
*
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts
index 9f7dd50532a..7a000ba0697 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts
@@ -7,6 +7,7 @@ import { Metadata } from '@dspace/core/shared/metadata.utils';
import { SearchResult } from '@dspace/core/shared/search/models/search-result.model';
import { hasValue } from '@dspace/shared/utils/empty.util';
+import { MetadataValue } from '../../../core/shared/metadata.models';
import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
/**
@@ -33,6 +34,25 @@ export class SearchResultDetailElementComponent, K ext
}
}
+ /**
+ * Gets all matching metadata values from hitHighlights or dso metadata.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @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 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]);
+ if (index !== -1) {
+ dsoMetadata[index] = highlights[i];
+ }
+ }
+ return dsoMetadata;
+ }
+
/**
* Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights.
*
@@ -43,6 +63,16 @@ export class SearchResultDetailElementComponent, K ext
return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
}
+ /**
+ * Gets the first matching metadata value from hitHighlights or dso metadata, preferring hitHighlights.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @returns {MetadataValue} the first matching value, or `undefined`.
+ */
+ firstMetadata(keyOrKeys: string | string[]): MetadataValue {
+ return Metadata.first([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
+ }
+
/**
* Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights.
*
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 6acfa839f09..e30b436e6ed 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
@@ -30,12 +30,12 @@
@if (dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])) {
@@ -44,7 +44,7 @@
@if (dso.hasMetadata('dc.description.abstract')) {
-
+
}
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 8498d6d32d3..108b389715c 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
@@ -14,6 +14,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbnail.component';
import { focusShadow } from '../../../../animations/focus';
+import { MetadataDirective } from '../../../../metadata.directive';
import { ThemedBadgesComponent } from '../../../../object-collection/shared/badges/themed-badges.component';
import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
import { TruncatableComponent } from '../../../../truncatable/truncatable.component';
@@ -31,6 +32,7 @@ import { SearchResultGridElementComponent } from '../../search-result-grid-eleme
standalone: true,
imports: [
AsyncPipe,
+ MetadataDirective,
RouterLink,
ThemedBadgesComponent,
ThemedThumbnailComponent,
diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
index ab7331ef235..0e09610cdd7 100644
--- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
@@ -5,6 +5,7 @@ import {
import { DSONameService } from '@dspace/core/breadcrumbs/dso-name.service';
import { BitstreamDataService } from '@dspace/core/data/bitstream-data.service';
import { DSpaceObject } from '@dspace/core/shared/dspace-object.model';
+import { MetadataValue } from '@dspace/core/shared/metadata.models';
import { Metadata } from '@dspace/core/shared/metadata.utils';
import { SearchResult } from '@dspace/core/shared/search/models/search-result.model';
import { hasValue } from '@dspace/shared/utils/empty.util';
@@ -47,6 +48,25 @@ export class SearchResultGridElementComponent, K exten
}
}
+ /**
+ * Gets all matching metadata values from hitHighlights or dso metadata.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @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 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]);
+ if (index !== -1) {
+ dsoMetadata[index] = highlights[i];
+ }
+ }
+ return dsoMetadata;
+ }
+
/**
* Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights.
*
@@ -57,6 +77,16 @@ export class SearchResultGridElementComponent, K exten
return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
}
+ /**
+ * Gets the first matching metadata value from hitHighlights or dso metadata, preferring hitHighlights.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @returns {MetadataValue} the first matching value, or `undefined`.
+ */
+ firstMetadata(keyOrKeys: string | string[]): MetadataValue {
+ return Metadata.first([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
+ }
+
/**
* Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights.
*
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 7777f0d26fd..96276a3eb0b 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
@@ -3,6 +3,7 @@
{{mdRepresentation.getValue()}}
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 4a5691c1760..9e63583d618 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
@@ -66,6 +66,22 @@ describe('BrowseLinkMetadataListElementComponent', () => {
it('should NOT match isLink', () => {
expect(comp.isLink()).toBe(false);
});
+
+ it('should set lang attribute when language is provided', () => {
+ (comp.mdRepresentation as any).language = 'en';
+ fixture.detectChanges();
+ const anchor: HTMLAnchorElement = fixture.debugElement.nativeElement.querySelector('a');
+ expect(anchor.getAttribute('lang')).toBe('en');
+ });
+
+ it('should remove lang attribute when language becomes undefined', () => {
+ (comp.mdRepresentation as any).language = 'fr';
+ fixture.detectChanges();
+ (comp.mdRepresentation as any).language = undefined;
+ fixture.detectChanges();
+ const anchor: HTMLAnchorElement = fixture.debugElement.nativeElement.querySelector('a');
+ expect(anchor.getAttribute('lang')).toBeNull();
+ });
});
describe('with metadata with an url', () => {
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 cdeef118b57..f277353565e 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
@@ -3,6 +3,7 @@ import { Component } from '@angular/core';
import { RouterLink } from '@angular/router';
import { VALUE_LIST_BROWSE_DEFINITION } from '@dspace/core/shared/value-list-browse-definition.resource-type';
+import { NormalizeLanguageCodePipe } from '../../../utils/normalize-language-code.pipe';
import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
@Component({
@@ -10,6 +11,7 @@ import { MetadataRepresentationListElementComponent } from '../metadata-represen
templateUrl: './browse-link-metadata-list-element.component.html',
standalone: true,
imports: [
+ NormalizeLanguageCodePipe,
RouterLink,
],
})
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 8c550d0276a..13c8769e370 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,18 +1,19 @@
@if ((mdRepresentation.representationType==='plain_text') && !isLink()) {
-
+
{{mdRepresentation.getValue()}}
}
@if ((mdRepresentation.representationType==='plain_text') && isLink()) {
{{mdRepresentation.getValue()}}
}
@if ((mdRepresentation.representationType==='authority_controlled')) {
- {{mdRepresentation.getValue()}}
+ {{mdRepresentation.getValue()}}
}
@if ((mdRepresentation.representationType==='browse_link')) {
{{mdRepresentation.getValue()}}
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
index 6f386e3cc0b..1d1c85d8f5d 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
@@ -51,4 +51,20 @@ describe('PlainTextMetadataListElementComponent', () => {
expect(fixture.debugElement.query(By.css('a.ds-browse-link')).nativeElement.innerHTML).toContain(mockMetadataRepresentation.value);
});
+ it('should set lang attribute when language is provided', () => {
+ (comp.mdRepresentation as any).language = 'en';
+ fixture.detectChanges();
+ const el: HTMLElement = fixture.debugElement.nativeElement.querySelector('.dont-break-out');
+ expect(el.getAttribute('lang')).toBe('en');
+ });
+
+ it('should remove lang attribute when language becomes undefined', () => {
+ (comp.mdRepresentation as any).language = 'fr';
+ fixture.detectChanges();
+ (comp.mdRepresentation as any).language = undefined;
+ fixture.detectChanges();
+ const el: HTMLElement = fixture.debugElement.nativeElement.querySelector('.dont-break-out');
+ expect(el.getAttribute('lang')).toBeNull();
+ });
+
});
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 55255bf205e..33673ee5ff3 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
@@ -3,6 +3,7 @@ import { Component } from '@angular/core';
import { RouterLink } from '@angular/router';
import { VALUE_LIST_BROWSE_DEFINITION } from '@dspace/core/shared/value-list-browse-definition.resource-type';
+import { NormalizeLanguageCodePipe } from '../../../utils/normalize-language-code.pipe';
import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
@Component({
@@ -10,6 +11,7 @@ import { MetadataRepresentationListElementComponent } from '../metadata-represen
templateUrl: './plain-text-metadata-list-element.component.html',
standalone: true,
imports: [
+ NormalizeLanguageCodePipe,
RouterLink,
],
})
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 b005af46ec3..fef888d9caf 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
@@ -18,22 +18,25 @@
(@if (item.hasMetadata('dc.publisher')) {
+ [dsMetadata]="item.firstMetadata('dc.publisher')">
,
}
- )
- @if (item.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);) {
+ @if (item.hasMetadata('dc.date.issued')) {
+
+ } @else {
+ {{ 'mydspace.results.no-date' | translate }}
+ })
+ @if (item.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);) {
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 fedd214e5ff..5aa3038261c 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
@@ -21,6 +21,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail.component';
import { fadeInOut } from '../../../animations/fade';
+import { MetadataDirective } from '../../../metadata.directive';
import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component';
import { ItemCollectionComponent } from '../../../object-collection/shared/mydspace-item-collection/item-collection.component';
import { ItemSubmitterComponent } from '../../../object-collection/shared/mydspace-item-submitter/item-submitter.component';
@@ -40,6 +41,7 @@ import { TruncatablePartComponent } from '../../../truncatable/truncatable-part/
AsyncPipe,
ItemCollectionComponent,
ItemSubmitterComponent,
+ MetadataDirective,
NgClass,
ThemedBadgesComponent,
ThemedThumbnailComponent,
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 c506050ece7..b92d56f8e8e 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
@@ -10,7 +10,7 @@
}
@if (dso.shortDescription) {
-
+
}
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 d2e0223a4e4..922e39a3ac2 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
@@ -8,6 +8,7 @@ import { Collection } from '@dspace/core/shared/collection.model';
import { CollectionSearchResult } from '@dspace/core/shared/object-collection/collection-search-result.model';
import { ViewMode } from '@dspace/core/shared/view-mode.model';
+import { MetadataDirective } from '../../../metadata.directive';
import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component';
import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
import { SearchResultListElementComponent } from '../search-result-list-element.component';
@@ -18,6 +19,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
templateUrl: 'collection-search-result-list-element.component.html',
standalone: true,
imports: [
+ MetadataDirective,
NgClass,
RouterLink,
ThemedBadgesComponent,
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 392a369efbd..b435806aabc 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
@@ -10,7 +10,7 @@
}
@if (dso.shortDescription) {
-
+
}
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 97a7fbc65ee..441e645196a 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
@@ -8,6 +8,7 @@ import { Community } from '@dspace/core/shared/community.model';
import { CommunitySearchResult } from '@dspace/core/shared/object-collection/community-search-result.model';
import { ViewMode } from '@dspace/core/shared/view-mode.model';
+import { MetadataDirective } from '../../../metadata.directive';
import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component';
import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
import { SearchResultListElementComponent } from '../search-result-list-element.component';
@@ -18,6 +19,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
templateUrl: 'community-search-result-list-element.component.html',
standalone: true,
imports: [
+ MetadataDirective,
NgClass,
RouterLink,
ThemedBadgesComponent,
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 53ef93bc54c..065c4dfe436 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
@@ -38,20 +38,20 @@
@if (dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')) {
(@if (dso.firstMetadataValue('dc.publisher')) {
-
+
}
@if (dso.firstMetadataValue('dc.publisher') && dso.firstMetadataValue('dc.date.issued')) {
,
}
@if (dso.firstMetadataValue('dc.date.issued')) {
-
+
})
}
@if (dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0) {
}
- @if (selectItem.dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])) {
- {{selectItem.dso.firstMetadataValue(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])}}
- }
+
+ @if (selectItem.dso.firstMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); as author) {
+
+ }
+
{{ dsoNameService.getName(selectItem.dso) }}
}
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 bcef84011f0..9d0e666e4ba 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
@@ -24,6 +24,7 @@ import { map } from 'rxjs/operators';
import { BtnDisabledDirective } from '../../btn-disabled.directive';
import { ErrorComponent } from '../../error/error.component';
import { ThemedLoadingComponent } from '../../loading/themed-loading.component';
+import { MetadataDirective } from '../../metadata.directive';
import { PaginationComponent } from '../../pagination/pagination.component';
import { VarDirective } from '../../utils/var.directive';
import { DSpaceObjectSelect } from '../object-select.model';
@@ -38,6 +39,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
BtnDisabledDirective,
ErrorComponent,
FormsModule,
+ MetadataDirective,
NgClass,
PaginationComponent,
RouterLink,
diff --git a/src/app/shared/utils/normalize-language-code-utils.ts b/src/app/shared/utils/normalize-language-code-utils.ts
new file mode 100644
index 00000000000..79a6497ba83
--- /dev/null
+++ b/src/app/shared/utils/normalize-language-code-utils.ts
@@ -0,0 +1,15 @@
+/**
+ * Normalizes a language code by replacing underscores with hyphens.
+ *
+ * This function is useful for transforming POSIX-style language codes (e.g., 'en_US') into
+ * standard BCP 47 language tags (e.g., 'en-US').
+ *
+ * @param value - The input string to be transformed. Can be null or undefined.
+ * @returns The transformed string with underscores replaced by dashes, or the original value if null/undefined.
+ */
+export function normalizeLanguageCode(value: string | null | undefined): string | null | undefined {
+ if (value === null || value === undefined) {
+ return value;
+ }
+ return value.replace(/_/g, '-');
+}
diff --git a/src/app/shared/utils/normalize-language-code.pipe.spec.ts b/src/app/shared/utils/normalize-language-code.pipe.spec.ts
new file mode 100644
index 00000000000..b89b9b3ba43
--- /dev/null
+++ b/src/app/shared/utils/normalize-language-code.pipe.spec.ts
@@ -0,0 +1,25 @@
+import { NormalizeLanguageCodePipe } from './normalize-language-code.pipe';
+
+describe('NormalizeLanguageCodePipe', () => {
+ const pipe = new NormalizeLanguageCodePipe();
+
+ it('transforms language codes replacing underscores with dashes', () => {
+ expect(pipe.transform('en_US')).toBe('en-US');
+ expect(pipe.transform('pt_BR')).toBe('pt-BR');
+ expect(pipe.transform('zh_Hant_TW')).toBe('zh-Hant-TW');
+ });
+
+ it('returns the same value when there are no underscores', () => {
+ expect(pipe.transform('en')).toBe('en');
+ expect(pipe.transform('fr')).toBe('fr');
+ });
+
+ it('preserves null and undefined input', () => {
+ expect(pipe.transform(null)).toBeNull();
+ expect(pipe.transform(undefined)).toBeUndefined();
+ });
+
+ it('handles empty string input', () => {
+ expect(pipe.transform('')).toBe('');
+ });
+});
diff --git a/src/app/shared/utils/normalize-language-code.pipe.ts b/src/app/shared/utils/normalize-language-code.pipe.ts
new file mode 100644
index 00000000000..ec3ff4ed730
--- /dev/null
+++ b/src/app/shared/utils/normalize-language-code.pipe.ts
@@ -0,0 +1,31 @@
+import {
+ Pipe,
+ PipeTransform,
+} from '@angular/core';
+
+import { normalizeLanguageCode } from './normalize-language-code-utils';
+
+/**
+ * A custom Angular pipe that normalizes language codes by replacing underscores with dashes.
+ *
+ * This pipe is useful for transforming POSIX-style language codes (e.g., 'en_US') into
+ * standard BCP 47 language tags (e.g., 'en-US').
+ *
+ * Example usage in a template:
+ * {{ 'en_US' | dsNormalizeLanguageCode }} -> 'en-US'
+ */
+@Pipe({
+ name: 'dsNormalizeLanguageCode',
+ standalone: true,
+})
+export class NormalizeLanguageCodePipe implements PipeTransform {
+ /**
+ * Transforms the input string by replacing all underscores with dashes.
+ *
+ * @param value - The input string to be transformed. Can be null or undefined.
+ * @returns The transformed string with underscores replaced by dashes, or the original value if null/undefined.
+ */
+ transform(value: string | null | undefined): string | null | undefined {
+ return normalizeLanguageCode(value);
+ }
+}
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 e6b33d0b630..f5c006346ce 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
@@ -4,6 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { FullFileSectionComponent as BaseComponent } from '../../../../../../../app/item-page/full/field-components/file-section/full-file-section.component';
import { ThemedFileDownloadLinkComponent } from '../../../../../../../app/shared/file-download-link/themed-file-download-link.component';
+import { MetadataDirective } from '../../../../../../../app/shared/metadata.directive';
import { MetadataFieldWrapperComponent } from '../../../../../../../app/shared/metadata-field-wrapper/metadata-field-wrapper.component';
import { PaginationComponent } from '../../../../../../../app/shared/pagination/pagination.component';
import { FileSizePipe } from '../../../../../../../app/shared/utils/file-size-pipe';
@@ -20,6 +21,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
imports: [
AsyncPipe,
FileSizePipe,
+ MetadataDirective,
MetadataFieldWrapperComponent,
PaginationComponent,
ThemedFileDownloadLinkComponent,
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 951d10bb3d0..5ca3ee43b04 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,6 +1,7 @@
import { Component } from '@angular/core';
import { TranslateModule } from '@ngx-translate/core';
+import { MetadataDirective } from '../../../../../../../../app/shared/metadata.directive';
import { MetadataFieldWrapperComponent } from '../../../../../../../../app/shared/metadata-field-wrapper/metadata-field-wrapper.component';
import { ItemDetailPreviewFieldComponent as BaseComponent } from '../../../../../../../../app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
@@ -10,6 +11,7 @@ import { ItemDetailPreviewFieldComponent as BaseComponent } from '../../../../..
templateUrl: '../../../../../../../../app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.html',
standalone: true,
imports: [
+ MetadataDirective,
MetadataFieldWrapperComponent,
TranslateModule,
],
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 cf3cbbabe67..a0988cd1d2c 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
@@ -6,6 +6,7 @@ import { Component } from '@angular/core';
import { TranslateModule } from '@ngx-translate/core';
import { fadeInOut } from '../../../../../../../app/shared/animations/fade';
+import { MetadataDirective } from '../../../../../../../app/shared/metadata.directive';
import { ThemedBadgesComponent } from '../../../../../../../app/shared/object-collection/shared/badges/themed-badges.component';
import { ItemCollectionComponent } from '../../../../../../../app/shared/object-collection/shared/mydspace-item-collection/item-collection.component';
import { ItemSubmitterComponent } from '../../../../../../../app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component';
@@ -26,6 +27,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
AsyncPipe,
ItemCollectionComponent,
ItemSubmitterComponent,
+ MetadataDirective,
NgClass,
ThemedBadgesComponent,
ThemedThumbnailComponent,
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 7c890851899..d3a08320053 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
@@ -8,6 +8,7 @@ import { Context } from '@dspace/core/shared/context.model';
import { ItemSearchResult } from '@dspace/core/shared/object-collection/item-search-result.model';
import { ViewMode } from '@dspace/core/shared/view-mode.model';
+import { MetadataDirective } from '../../../../../../../../../app/shared/metadata.directive';
import { ThemedBadgesComponent } from '../../../../../../../../../app/shared/object-collection/shared/badges/themed-badges.component';
import { listableObjectComponent } from '../../../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
import { ItemSearchResultListElementComponent as BaseComponent } from '../../../../../../../../../app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
@@ -26,6 +27,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../../../app/thumbna
standalone: true,
imports: [
AsyncPipe,
+ MetadataDirective,
NgClass,
RouterLink,
ThemedBadgesComponent,
- +
@if ((mdRepresentation.representationType==='plain_text') && !isLink()) {
-
+
{{mdRepresentation.getValue()}}
}
@if ((mdRepresentation.representationType==='plain_text') && isLink()) {
{{mdRepresentation.getValue()}}
}
@if ((mdRepresentation.representationType==='authority_controlled')) {
- {{mdRepresentation.getValue()}}
+ {{mdRepresentation.getValue()}}
}
@if ((mdRepresentation.representationType==='browse_link')) {
{{mdRepresentation.getValue()}}
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
index 6f386e3cc0b..1d1c85d8f5d 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
@@ -51,4 +51,20 @@ describe('PlainTextMetadataListElementComponent', () => {
expect(fixture.debugElement.query(By.css('a.ds-browse-link')).nativeElement.innerHTML).toContain(mockMetadataRepresentation.value);
});
+ it('should set lang attribute when language is provided', () => {
+ (comp.mdRepresentation as any).language = 'en';
+ fixture.detectChanges();
+ const el: HTMLElement = fixture.debugElement.nativeElement.querySelector('.dont-break-out');
+ expect(el.getAttribute('lang')).toBe('en');
+ });
+
+ it('should remove lang attribute when language becomes undefined', () => {
+ (comp.mdRepresentation as any).language = 'fr';
+ fixture.detectChanges();
+ (comp.mdRepresentation as any).language = undefined;
+ fixture.detectChanges();
+ const el: HTMLElement = fixture.debugElement.nativeElement.querySelector('.dont-break-out');
+ expect(el.getAttribute('lang')).toBeNull();
+ });
+
});
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 55255bf205e..33673ee5ff3 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
@@ -3,6 +3,7 @@ import { Component } from '@angular/core';
import { RouterLink } from '@angular/router';
import { VALUE_LIST_BROWSE_DEFINITION } from '@dspace/core/shared/value-list-browse-definition.resource-type';
+import { NormalizeLanguageCodePipe } from '../../../utils/normalize-language-code.pipe';
import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
@Component({
@@ -10,6 +11,7 @@ import { MetadataRepresentationListElementComponent } from '../metadata-represen
templateUrl: './plain-text-metadata-list-element.component.html',
standalone: true,
imports: [
+ NormalizeLanguageCodePipe,
RouterLink,
],
})
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 b005af46ec3..fef888d9caf 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
@@ -18,22 +18,25 @@
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 fedd214e5ff..5aa3038261c 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
@@ -21,6 +21,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail.component';
import { fadeInOut } from '../../../animations/fade';
+import { MetadataDirective } from '../../../metadata.directive';
import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component';
import { ItemCollectionComponent } from '../../../object-collection/shared/mydspace-item-collection/item-collection.component';
import { ItemSubmitterComponent } from '../../../object-collection/shared/mydspace-item-submitter/item-submitter.component';
@@ -40,6 +41,7 @@ import { TruncatablePartComponent } from '../../../truncatable/truncatable-part/
AsyncPipe,
ItemCollectionComponent,
ItemSubmitterComponent,
+ MetadataDirective,
NgClass,
ThemedBadgesComponent,
ThemedThumbnailComponent,
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 c506050ece7..b92d56f8e8e 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
@@ -10,7 +10,7 @@
}
@if (dso.shortDescription) {
-
+
}
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 d2e0223a4e4..922e39a3ac2 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
@@ -8,6 +8,7 @@ import { Collection } from '@dspace/core/shared/collection.model';
import { CollectionSearchResult } from '@dspace/core/shared/object-collection/collection-search-result.model';
import { ViewMode } from '@dspace/core/shared/view-mode.model';
+import { MetadataDirective } from '../../../metadata.directive';
import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component';
import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
import { SearchResultListElementComponent } from '../search-result-list-element.component';
@@ -18,6 +19,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
templateUrl: 'collection-search-result-list-element.component.html',
standalone: true,
imports: [
+ MetadataDirective,
NgClass,
RouterLink,
ThemedBadgesComponent,
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 392a369efbd..b435806aabc 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
@@ -10,7 +10,7 @@
}
@if (dso.shortDescription) {
-
+
}
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 97a7fbc65ee..441e645196a 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
@@ -8,6 +8,7 @@ import { Community } from '@dspace/core/shared/community.model';
import { CommunitySearchResult } from '@dspace/core/shared/object-collection/community-search-result.model';
import { ViewMode } from '@dspace/core/shared/view-mode.model';
+import { MetadataDirective } from '../../../metadata.directive';
import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component';
import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
import { SearchResultListElementComponent } from '../search-result-list-element.component';
@@ -18,6 +19,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
templateUrl: 'community-search-result-list-element.component.html',
standalone: true,
imports: [
+ MetadataDirective,
NgClass,
RouterLink,
ThemedBadgesComponent,
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 53ef93bc54c..065c4dfe436 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
@@ -38,20 +38,20 @@