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

DSC-2650 Removed duplicated text and last updated date text, fixed repository name retrieval

Approved-by: Andrea Barbasso

Author: Mattia Vianelli

src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html

@@ -5,11 +5,9 @@ <h2 class="mb-3">{{ 'info.end-user-agreement.head' | translate }}</h2>
     <ds-markdown-viewer [value]="(userAgreementText$ | async)"></ds-markdown-viewer>
   } @else {
     <div class="default-agreement-content">
-      <h1>{{ 'info.end-user-agreement.head' | translate }}</h1>
-      <p><em>Last updated May 4, 2023</em></p>
 
       <h2>Agreement to terms</h2>
-      <p>These Terms of Use constitute a legally binding agreement made between you, whether personally or on behalf of an entity ("you") and {{ 'repository.title' | translate }} ("Company", "we", "us", or "our"), concerning your access to and use of this website as well as any other media form, media channel, mobile website or mobile application related, linked, or otherwise connected thereto (collectively, the "Site"). You agree that by accessing the Site, you have read, understood, and agreed to be bound by all of these Terms of Use and any future amendments thereof.</p>
+      <p>These Terms of Use constitute a legally binding agreement made between you, whether personally or on behalf of an entity ("you") and {{ repositoryName$ | async }} ("Company", "we", "us", or "our"), concerning your access to and use of this website as well as any other media form, media channel, mobile website or mobile application related, linked, or otherwise connected thereto (collectively, the "Site"). You agree that by accessing the Site, you have read, understood, and agreed to be bound by all of these Terms of Use and any future amendments thereof.</p>
       <p>Supplemental terms and conditions or documents that may be posted on the Site from time to time are hereby expressly incorporated herein by reference. We reserve the right, in our sole discretion, to make changes or modifications to these Terms of Use at any time and for any reason. We will alert you about any changes by updating the "Last updated" date of these Terms of Use, and you waive any right to receive specific notice of each such change. Please ensure that you check the applicable Terms every time you use our Site so that you understand which Terms apply. You will be subject to, and will be deemed to have been made aware of and to have accepted, the changes in any revised Terms of Use by your continued use of the Site after the date such revised Terms of Use are posted.</p>
       <p>The information provided on the Site is not intended for distribution to or use by any person or entity in any jurisdiction or country where such distribution or use would be contrary to law or regulation or which would subject us to any registration requirement within such jurisdiction or country. Accordingly, those persons who choose to access the Site from other locations do so on their own initiative and are solely responsible for compliance with local laws, if and to the extent local laws are applicable.</p>
 

src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.spec.ts

@@ -12,10 +12,13 @@ import {
   of,
 } from 'rxjs';
 
+import { Root } from '../../../core/data/root.model';
+import { RootDataService } from '../../../core/data/root-data.service';
 import { SiteDataService } from '../../../core/data/site-data.service';
 import { LocaleService } from '../../../core/locale/locale.service';
 import { MathService } from '../../../core/shared/math.service';
 import { Site } from '../../../core/shared/site.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { EndUserAgreementContentComponent } from './end-user-agreement-content.component';
 
 describe('EndUserAgreementContentComponent', () => {
@@ -24,6 +27,7 @@ describe('EndUserAgreementContentComponent', () => {
 
   let siteServiceStub: any;
   let localeServiceStub: any;
+  let rootServiceStub: any;
 
   const site: Site = Object.assign(new Site(), {
     metadata: {
@@ -38,6 +42,10 @@ describe('EndUserAgreementContentComponent', () => {
     },
   });
 
+  const root: Root = Object.assign(new Root(), {
+    dspaceName: 'Test Repository',
+  });
+
   beforeEach(waitForAsync(() => {
 
     localeServiceStub = {
@@ -50,11 +58,15 @@ describe('EndUserAgreementContentComponent', () => {
         return of(site);
       },
     };
+    rootServiceStub = {
+      findRoot: jasmine.createSpy('findRoot').and.returnValue(createSuccessfulRemoteDataObject$(root)),
+    };
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), EndUserAgreementContentComponent],
       providers: [{ provide: SiteDataService, useValue: siteServiceStub },
         { provide: LocaleService, useValue: localeServiceStub },
         { provide: MathService, useValue: {} },
+        { provide: RootDataService, useValue: rootServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })

src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.ts

@@ -12,13 +12,20 @@ import {
 import {
   BehaviorSubject,
   combineLatest,
+  Observable,
   Subscription,
 } from 'rxjs';
-import { take } from 'rxjs/operators';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
+import { Root } from '../../../core/data/root.model';
+import { RootDataService } from '../../../core/data/root-data.service';
 import { SiteDataService } from '../../../core/data/site-data.service';
 import { LocaleService } from '../../../core/locale/locale.service';
 import { MetadatumViewModel } from '../../../core/shared/metadata.models';
+import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { MarkdownViewerComponent } from '../../../shared/markdown-viewer/markdown-viewer.component';
 
@@ -45,11 +52,14 @@ export class EndUserAgreementContentComponent implements OnInit, OnDestroy {
 
   userAgreementText$: BehaviorSubject<string | null> = new BehaviorSubject(null);
 
+  repositoryName$: Observable<string>;
+
   fallbackText = 'info.end-user-agreement.content.fallback';
 
   constructor(private siteService: SiteDataService,
               private localeService: LocaleService,
               private translateService: TranslateService,
+              private rootService: RootDataService,
   ) {
   }
 
@@ -58,6 +68,11 @@ export class EndUserAgreementContentComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
+    this.repositoryName$ = this.rootService.findRoot(true).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((payload: Root) => payload.dspaceName),
+    );
+
     const site$ = this.siteService.find().pipe(take(1));
     this.subs.push(
       combineLatest([site$, this.localeService.getCurrentLanguageCode()]).subscribe(([site, langCode]) => {