Merged in task/dspace-cris-2025_02_x/DSC-2458 (pull request DSpace#4591)

Task/dspace cris 2025 02 x/DSC-2458

Approved-by: Andrea Barbasso

Author: Mattia Vianelli

src/app/info/cms-info/cms-info.component.html

@@ -0,0 +1,14 @@
+<div class="container">
+
+  @if (headLabel$ | async; as headLabel) {
+    <h2>{{ headLabel | translate }}</h2>
+  }
+
+  @if (metadataLoaded$ | async) {
+    @if (cmsMetadataValue$ | async; as value) {
+      <ds-markdown-viewer [value]="value"></ds-markdown-viewer>
+    } @else {
+      <div>{{ 'info.empty-cms-metadata-error' | translate }}</div>
+    }
+  }
+</div>

src/app/info/cms-info/cms-info.component.scss

@@ -0,0 +1,90 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { MockComponent } from 'ng-mocks';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import { SiteDataService } from 'src/app/core/data/site-data.service';
+import { LocaleService } from 'src/app/core/locale/locale.service';
+import { Site } from 'src/app/core/shared/site.model';
+
+import { MarkdownViewerComponent } from '../../shared/markdown-viewer/markdown-viewer.component';
+import { CmsInfoComponent } from './cms-info.component';
+
+describe('CmsInfoComponent', () => {
+  let component: CmsInfoComponent;
+  let fixture: ComponentFixture<CmsInfoComponent>;
+  let localeServiceSpy: jasmine.SpyObj<LocaleService>;
+  let activatedRouteStub: any;
+  let siteServiceStub: any;
+
+  const site: Site = Object.assign(new Site(), {
+    metadata: {
+      'dc.rights' : [{
+        value: 'English text',
+        language: 'en',
+      },
+      {
+        value: 'German text',
+        language: 'de',
+      }],
+    },
+  });
+
+  beforeEach(async () => {
+    localeServiceSpy = jasmine.createSpyObj('LocaleService', ['getCurrentLanguageCode']);
+    localeServiceSpy.getCurrentLanguageCode.and.returnValue(of('en'));
+    activatedRouteStub = {
+      data: of({ schema: 'cris', qualifier: 'testQualifier' }),
+      queryParamMap: of({}),
+    };
+    siteServiceStub = {
+      find(): Observable<Site> {
+        return of(site);
+      },
+    };
+    await TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        CmsInfoComponent,
+        MockComponent(MarkdownViewerComponent),
+      ],
+      providers: [
+        { provide: SiteDataService, useValue: siteServiceStub },
+        { provide: LocaleService, useValue: localeServiceSpy },
+        { provide: ActivatedRoute, useValue: activatedRouteStub },
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(CmsInfoComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should set headLabel$ when data is successfully retrieved', () => {
+    const headLabelSpy = spyOn(component.headLabel$, 'next');
+
+    component.ngOnInit();
+
+    expect(headLabelSpy).toHaveBeenCalledOnceWith('info.testQualifier.head');
+  });
+
+  it('should log a warning to console if metadata content is missing', () => {
+    spyOn(console, 'warn');
+    site.metadata['cris.cms.testQualifier'] = undefined;
+
+    component.ngOnInit();
+
+    expect(console.warn).toHaveBeenCalledWith('Metadata cris.cms.testQualifier has no content');
+  });
+});

src/app/info/cms-info/cms-info.component.spec.ts

@@ -0,0 +1,75 @@
+import { AsyncPipe } from '@angular/common';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { SiteDataService } from '../../core/data/site-data.service';
+import { LocaleService } from '../../core/locale/locale.service';
+import { hasValue } from '../../shared/empty.util';
+import { MarkdownViewerComponent } from '../../shared/markdown-viewer/markdown-viewer.component';
+
+@Component({
+  selector: 'ds-cms-info',
+  templateUrl: './cms-info.component.html',
+  styleUrls: ['./cms-info.component.scss'],
+  imports: [
+    AsyncPipe,
+    MarkdownViewerComponent,
+    TranslateModule,
+  ],
+})
+export class CmsInfoComponent implements OnInit {
+
+  /**
+   * The i18n label for the page title
+   */
+  headLabel$ = new BehaviorSubject<string>('');
+
+  /**
+   * The content of the CMS metadata
+   */
+  cmsMetadataValue$ = new BehaviorSubject<string>('');
+
+  /**
+   * True if the metadata content is being loaded
+   */
+  metadataLoaded$ = new BehaviorSubject<boolean>(false);
+
+  constructor(
+    private siteService: SiteDataService,
+    private locale: LocaleService,
+    private route: ActivatedRoute,
+  ) {
+  }
+
+  ngOnInit() {
+
+    const data$ = this.route.data.pipe(
+      take(1),
+    );
+
+    const site$ = this.siteService.find().pipe(take(1));
+    const lang$ = this.locale.getCurrentLanguageCode().pipe(take(1));
+
+    combineLatest([data$, site$, lang$]).subscribe(([data, site, lang]) => {
+      this.headLabel$.next(`info.${data.qualifier}.head`);
+      const mdValue = site?.firstMetadataValue(`${data.schema}.cms.${data.qualifier}`, { language: lang });
+      if (hasValue(mdValue)) {
+        this.cmsMetadataValue$.next(mdValue);
+      } else {
+        console.warn(`Metadata ${data.schema}.cms.${data.qualifier} has no content`);
+      }
+      this.metadataLoaded$.next(true);
+    });
+
+  }
+
+}

src/app/info/cms-info/cms-info.component.ts

@@ -9,6 +9,7 @@ import { notifyInfoGuard } from '../core/coar-notify/notify-info/notify-info.gua
 import { feedbackGuard } from '../core/feedback/feedback.guard';
 import { hasValue } from '../shared/empty.util';
 import { AccessibilitySettingsComponent } from './accessibility-settings/accessibility-settings.component';
+import { CmsInfoComponent } from './cms-info/cms-info.component';
 import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
 import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
 import {
@@ -21,6 +22,19 @@ import {
 import { NotifyInfoComponent } from './notify-info/notify-info.component';
 import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
 
+function cmsInfoRoute(qualifier: string, schema: string): Route {
+  return {
+    path: qualifier,
+    component: CmsInfoComponent,
+    resolve: { breadcrumb: i18nBreadcrumbResolver },
+    data: {
+      title: `info.${qualifier}.title`,
+      breadcrumbKey: `info.${qualifier}`,
+      schema: schema,
+      qualifier: qualifier,
+    },
+  };
+}
 
 export const ROUTES: Routes = [
   {
@@ -60,4 +74,5 @@ export const ROUTES: Routes = [
       breadcrumbKey: 'info.coar-notify-support',
     },
   } : undefined,
+  cmsInfoRoute(PRIVACY_PATH, 'cris'),
 ].filter((route: Route) => hasValue(route));