Merge remote-tracking branch '4Science_gitHub/task/main/DURACOM-507' into task/main/DURACOM-507

Author: FrancescoMolinaro

src/app/admin/admin-sidebar/admin-sidebar.component.html

@@ -26,7 +26,7 @@ <h4 class="my-1">{{ 'menu.header.admin' | translate }}</h4>
     <div class="sidebar-full-width-container" id="sidebar-top-level-items-container">
       <div class="sidebar-full-width-container" id="sidebar-top-level-items" role="menubar"
         [attr.aria-label]="'menu.header.admin.description' |translate">
-        @for (sectionDTO of (sectionDTOs$ | async); track sectionDTO) {
+        @for (sectionDTO of (sectionDTOs$ | async); track sectionDTO.menuSection.id) {
           <ds-menu-component-loader [menuID]="menuID"
                                     [expandable]="sectionDTO.hasSubSections || sectionDTO.menuSection.alwaysRenderExpandable"
                                     [section]="sectionDTO.menuSection">

src/app/core/layout/section-data.service.ts

@@ -1,4 +1,6 @@
 import { Injectable } from '@angular/core';
+import { dataService } from '@dspace/core/cache/builders/build-decorators';
+import { SECTION } from '@dspace/core/layout/models/section.resource-type';
 import { Observable } from 'rxjs';
 
 import { DSONameService } from '../breadcrumbs/dso-name.service';
@@ -20,6 +22,7 @@ import { Section } from './models/section.model';
  * A service responsible for fetching data from the REST API on the sections endpoint.
  */
 @Injectable({ providedIn: 'root' })
+@dataService(SECTION)
 export class SectionDataService extends IdentifiableDataService<Section> {
 
   protected linkPath = 'sections';

src/app/core/layout/tab-data.service.ts

@@ -1,4 +1,6 @@
 import { Injectable } from '@angular/core';
+import { dataService } from '@dspace/core/cache/builders/build-decorators';
+import { TAB } from '@dspace/core/layout/models/tab.resource-type';
 import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
 import {
   hasNoValue,
@@ -31,6 +33,7 @@ import {
  * filtering out tabs that contain only minor (secondary) boxes.
  */
 @Injectable({ providedIn: 'root' })
+@dataService(TAB)
 export class TabDataService extends IdentifiableDataService<DynamicLayoutTab> {
   protected searchFindByItem = 'findByItem';
   protected searchFindByEntityType = 'findByEntityType';

src/app/dynamic-layout/dynamic-layout-loader/dynamic-layout-loader.component.spec.ts

@@ -110,7 +110,9 @@ describe('DynamicLayoutLoaderComponent', () => {
       expect(component).toBeTruthy();
     });
 
-    it('should show horizontal component', () => {
+    it('should show horizontal component', async () => {
+      await fixture.whenStable();
+      fixture.detectChanges();
       expect(fixture.debugElement.query(By.css('.horizontal-layout'))).toBeTruthy();
     });
   });
@@ -135,7 +137,9 @@ describe('DynamicLayoutLoaderComponent', () => {
       expect(component).toBeTruthy();
     });
 
-    it('should show vertical component', () => {
+    it('should show vertical component', async () => {
+      await fixture.whenStable();
+      fixture.detectChanges();
       expect(fixture.debugElement.query(By.css('.vertical-layout'))).toBeTruthy();
     });
   });

src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/metadataGroup/inline/inline.component.spec.ts

@@ -119,7 +119,9 @@ describe('InlineComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it('check metadata rendering', (done) => {
+  it('check metadata rendering', async () => {
+    await fixture.whenStable();
+    fixture.detectChanges();
     const rowsFound = fixture.debugElement.queryAll(By.css('div.metadata-group-entry'));
     expect(rowsFound.length).toBe(2);
 
@@ -135,7 +137,5 @@ describe('InlineComponent', () => {
     expect(span.nativeElement.textContent).toContain(testItem.metadata[mockField.metadataGroup.elements[0].metadata][1].value);
     span = divFound.query(By.css('span.metadata-group-entry-value:nth-child(2)'));
     expect(span.nativeElement.textContent).toContain(testItem.metadata[mockField.metadataGroup.elements[1].metadata][1].value);
-    done();
-
   });
 });

src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/metadataGroup/openstreetmap/openstreetmap.component.html

@@ -0,0 +1,15 @@
+@if ((initialized | async)) {
+  <div [class]="'openstreetmap-container ' + valueStyle">
+    @defer {
+      <ds-geospatial-map
+        [coordinates]="points"
+        [bbox]="bboxes"
+        [cluster]="cluster"
+        layout="item"
+        style="width: 100%;">
+      </ds-geospatial-map>
+    } @placeholder {
+      <div class="map-placeholder"></div>
+    }
+  </div>
+}

src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/metadataGroup/openstreetmap/openstreetmap.component.scss

@@ -0,0 +1,8 @@
+.openstreetmap-container {
+  min-height: 300px;
+  width: 100%;
+}
+
+.map-placeholder {
+  min-height: 300px;
+}

src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/metadataGroup/openstreetmap/openstreetmap.component.spec.ts

@@ -0,0 +1,131 @@
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { LayoutField } from '@dspace/core/layout/models/box.model';
+import { Item } from '@dspace/core/shared/item.model';
+import { TranslateLoaderMock } from '@dspace/core/testing/translate-loader.mock';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { OpenstreetmapComponent } from './openstreetmap.component';
+
+describe('OpenstreetmapComponent', () => {
+  let component: OpenstreetmapComponent;
+  let fixture: ComponentFixture<OpenstreetmapComponent>;
+  const testItem = Object.assign(new Item(), {
+    uuid: 'itemUUID',
+    id: 'itemUUID',
+    metadata: {
+      'dcterms.spatial': [
+        {
+          value: 'POINT(12.4924 41.8902)',
+        },
+        {
+          value: 'POINT(2.3522 48.8566)',
+        },
+      ],
+      'dc.coverage.spatial': [
+        {
+          value: 'POINT(-0.1278 51.5074)',
+        },
+        {
+          value: '{westlimit=12.23, southlimit=41.65, eastlimit=12.85, northlimit=42.02}',
+        },
+      ],
+    },
+    _links: {
+      self: { href: 'item-selflink' },
+    },
+  });
+
+  const mockField = Object.assign({
+    id: 1,
+    metadata: 'dcterms.spatial',
+    fieldType: 'METADATAGROUP',
+    label: 'Location(s)',
+    rendering: 'OPENSTREETMAP',
+    style: 'container row',
+    styleLabel: 'fw-bold col-4',
+    styleValue: 'col',
+    metadataGroup: {
+      leading: 'dcterms.spatial',
+      elements: [
+        {
+          metadata: 'dcterms.spatial',
+          label: 'Spatial',
+          rendering: 'TEXT',
+          fieldType: 'METADATA',
+          style: null,
+          styleLabel: 'fw-bold col-0',
+          styleValue: 'col',
+        },
+        {
+          metadata: 'dc.coverage.spatial',
+          label: 'Coverage',
+          rendering: 'TEXT',
+          fieldType: 'METADATA',
+          style: null,
+          styleLabel: 'fw-bold col-0',
+          styleValue: 'col',
+        },
+      ],
+    },
+  }) as LayoutField;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+        OpenstreetmapComponent,
+      ],
+      providers: [
+        { provide: 'fieldProvider', useValue: mockField },
+        { provide: 'itemProvider', useValue: testItem },
+        { provide: 'renderingSubTypeProvider', useValue: '' },
+        { provide: 'tabNameProvider', useValue: '' },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(OpenstreetmapComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.OnPush },
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(OpenstreetmapComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should extract coordinates from multiple metadata fields', () => {
+    expect(component.points.length).toBe(3);
+    expect(component.points).toContain('POINT(12.4924 41.8902)');
+    expect(component.points).toContain('POINT(2.3522 48.8566)');
+    expect(component.points).toContain('POINT(-0.1278 51.5074)');
+  });
+
+  it('should extract bboxes from multiple metadata fields', () => {
+    expect(component.bboxes.length).toBe(1);
+    expect(component.bboxes).toContain('{westlimit=12.23, southlimit=41.65, eastlimit=12.85, northlimit=42.02}');
+  });
+
+  it('should have clustering enabled by default', () => {
+    expect(component.cluster).toBeTrue();
+  });
+});

src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/metadataGroup/openstreetmap/openstreetmap.component.ts

@@ -0,0 +1,79 @@
+import { AsyncPipe } from '@angular/common';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+
+import { GeospatialMapComponent } from '../../../../../../../../shared/geospatial-map/geospatial-map.component';
+import { FieldRenderingType } from '../../field-rendering-type';
+import { MetadataBoxFieldRendering } from '../../metadata-box.decorator';
+import { MetadataGroupComponent } from '../metadata-group.component';
+
+/**
+ * This component renders geospatial metadata group fields on an OpenStreetMap map
+ * using the ds-geospatial-map component.
+ *
+ * It supports multiple metadata fields within the metadata group for both point
+ * coordinates and bounding boxes. All metadata values across all group elements
+ * are collected and passed to the map component.
+ */
+@MetadataBoxFieldRendering(FieldRenderingType.OPENSTREETMAP, true)
+@Component({
+  selector: 'ds-openstreetmap',
+  templateUrl: './openstreetmap.component.html',
+  styleUrls: ['./openstreetmap.component.scss'],
+  imports: [
+    AsyncPipe,
+    GeospatialMapComponent,
+  ],
+})
+export class OpenstreetmapComponent extends MetadataGroupComponent implements OnInit {
+
+  /**
+   * Point coordinates extracted from the metadata group (WKT format, e.g. 'POINT(lng lat)')
+   */
+  points: string[] = [];
+
+  /**
+   * Bounding box values extracted from the metadata group
+   */
+  bboxes: string[] = [];
+
+  /**
+   * Whether to cluster markers on the map
+   */
+  cluster = true;
+
+  override ngOnInit(): void {
+    super.ngOnInit();
+    this.extractGeospatialData();
+  }
+
+  /**
+   * Extract point and bounding box values from all metadata fields in the group.
+   * Point values are WKT POINT strings (e.g. 'POINT(lng lat)').
+   * Bounding box values use a different format (e.g. '{westlimit=..., southlimit=..., ...}').
+   * Simple heuristic: values starting with 'POINT' are treated as coordinates,
+   * everything else is treated as a bounding box.
+   */
+  private extractGeospatialData(): void {
+    this.points = [];
+    this.bboxes = [];
+
+    for (const element of this.field.metadataGroup.elements) {
+      const values = this.item.allMetadataValues(element.metadata);
+      if (values?.length) {
+        for (const value of values) {
+          if (!value) {
+            continue;
+          }
+          if (value.trim().toUpperCase().startsWith('POINT')) {
+            this.points.push(value);
+          } else {
+            this.bboxes.push(value);
+          }
+        }
+      }
+    }
+  }
+}

src/app/dynamic-layout/dynamic-layout-matrix/dynamic-layout-box-container/boxes/metadata/rendering-types/metadataGroup/table/table.component.spec.ts

@@ -121,7 +121,10 @@ describe('TableComponent', () => {
 
   });
 
-  it('check metadata rendering', (done) => {
+  it('check metadata rendering', async () => {
+    await fixture.whenStable();
+    fixture.detectChanges();
+
     const rowsFound = fixture.debugElement.queryAll(By.css('tr'));
     expect(rowsFound.length).toBe(3);
 
@@ -142,7 +145,5 @@ describe('TableComponent', () => {
     expect(td.nativeElement.textContent).toContain(testItem.metadata[mockField.metadataGroup.elements[0].metadata][1].value);
     td = rowFound.query(By.css('td:nth-child(2)'));
     expect(td.nativeElement.textContent).toContain(testItem.metadata[mockField.metadataGroup.elements[1].metadata][1].value);
-    done();
-
   });
 });