Merge remote-tracking branch 'gitHub/main' into task/main/DURACOM-453

Author: FrancescoMolinaro

src/app/core/locale/locale.interceptor.spec.ts

@@ -22,11 +22,12 @@ describe(`LocaleInterceptor`, () => {
   let localeService: any;
 
   const languageList = ['en;q=1', 'it;q=0.9', 'de;q=0.8', 'fr;q=0.7'];
+  const rootHref = 'https://sandbox.dspace.org/server/api';
 
-  const mockLocaleService = jasmine.createSpyObj('LocaleService', {
-    getCurrentLanguageCode: jasmine.createSpy('getCurrentLanguageCode'),
-    getLanguageCodeList: of(languageList),
-  });
+  const mockLocaleService = jasmine.createSpyObj('LocaleService', [
+    'getCurrentLanguageCode',
+    'getLanguageCodeList',
+  ]);
 
   const mockHalEndpointService = {
     getRootHref: jasmine.createSpy('getRootHref'),
@@ -54,6 +55,8 @@ describe(`LocaleInterceptor`, () => {
     localeService = TestBed.inject(LocaleService);
 
     localeService.getCurrentLanguageCode.and.returnValue(of('en'));
+    localeService.getLanguageCodeList.and.returnValue(of(languageList));
+    mockHalEndpointService.getRootHref.and.returnValue(rootHref);
   });
 
   describe('', () => {
@@ -82,6 +85,29 @@ describe(`LocaleInterceptor`, () => {
       const lang = httpRequest.request.headers.get('Accept-Language');
       expect(lang).toBeDefined();
       expect(lang).toBe(languageList.toString());
+      expect(localeService.getLanguageCodeList).toHaveBeenCalledWith(false);
+    });
+
+    it('should ignore EPerson settings for root endpoint requests', () => {
+      service.request(RestRequestMethod.GET, rootHref).subscribe((response) => {
+        expect(response).toBeTruthy();
+      });
+
+      httpMock.expectOne(rootHref);
+
+      expect(localeService.getLanguageCodeList).toHaveBeenCalledWith(true);
+    });
+
+    it('should ignore EPerson settings for eperson endpoint requests', () => {
+      const epersonHref = `${rootHref}/eperson/epersons/1234`;
+
+      service.request(RestRequestMethod.GET, epersonHref).subscribe((response) => {
+        expect(response).toBeTruthy();
+      });
+
+      httpMock.expectOne(epersonHref);
+
+      expect(localeService.getLanguageCodeList).toHaveBeenCalledWith(true);
     });
 
   });

src/app/core/locale/locale.interceptor.ts

@@ -31,7 +31,9 @@ export class LocaleInterceptor implements HttpInterceptor {
    */
   intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     let newReq: HttpRequest<any>;
-    return this.localeService.getLanguageCodeList(req.url === this.halEndpointService.getRootHref())
+    const ignoreEPersonSettings: boolean = this.shouldIgnoreEPersonSettings(req.url);
+
+    return this.localeService.getLanguageCodeList(ignoreEPersonSettings)
       .pipe(
         take(1),
         scan((acc: any, value: any) => [...acc, value], []),
@@ -45,4 +47,12 @@ export class LocaleInterceptor implements HttpInterceptor {
           return next.handle(newReq);
         }));
   }
+
+  /**
+   * Avoid recursive EPerson language lookup for requests that are needed to resolve EPerson itself.
+   */
+  private shouldIgnoreEPersonSettings(url: string): boolean {
+    const rootHref = this.halEndpointService.getRootHref();
+    return url === rootHref || url.startsWith(`${rootHref}/eperson/epersons`);
+  }
 }

src/app/item-page/simple/field-components/specific-field/license/item-page-license-field.component.html

@@ -0,0 +1,31 @@
+@if (licenses.length > 0 || uris.length > 0) {
+  <div class="item-page-field">
+    @if ((hasCcLicenseName$ | async) && (hasCcLicenseUri$ | async)) {
+      <ds-item-page-cc-license-field [item]="item" [variant]="'full'"></ds-item-page-cc-license-field>
+    } @else {
+      <ds-metadata-field-wrapper [label]="'item.page.license.title' | translate">
+        @if (licenses.length === uris.length) {
+          @for (license of licenses; track license; let last=$last; let i=$index) {
+            <a [href]="uris[i]" target="_blank" class="license-link"><span class="license-text">{{ license }}</span></a>
+            @if (!last) {
+              <span class="separator" [innerHTML]="separator"></span>
+            }
+          }
+        } @else {
+          @for (license of licenses; track license; let last=$last) {
+            <span class="license-text">{{ license }}</span>
+            @if (!last || uris.length > 0) {
+              <span class="separator" [innerHTML]="separator"></span>
+            }
+          }
+          @for (uri of uris; track uri; let last=$last) {
+            <a [href]="uri" target="_blank" class="license-link"><span class="license-text">{{ uri }}</span></a>
+            @if (!last) {
+              <span class="separator" [innerHTML]="separator"></span>
+            }
+          }
+        }
+      </ds-metadata-field-wrapper>
+    }
+  </div>
+}