Merged ux-plus-2023_02_x into UXP-126

Author: Andrea Barbasso

src/app/shared/carousel/carousel.component.html

@@ -1,10 +1,10 @@
 <ngb-carousel #carousel [interval]="2000" (slide)="onSlide($event)" class="ds-carousel">
   <ng-template ngbSlide *ngFor="let item of items; let i = index; let last = last">
     <ng-container *ngIf="getItemLink(item.indexableObject); let currentLink; else carouselContent">
-      <a *ngIf="isLinkInternal(currentLink)" [routerLink]="currentLink">
+      <a *ngIf="internalLinkService.isLinkInternal(currentLink)" [routerLink]="internalLinkService.getRelativePath(currentLink)">
         <ng-container *ngTemplateOutlet="carouselContent"></ng-container>
       </a>
-      <a *ngIf="!isLinkInternal(currentLink)" [href]="currentLink" [target]="carouselOptions.targetBlank ? '_blank' : null">
+      <a *ngIf="!internalLinkService.isLinkInternal(currentLink)" [href]="currentLink" [target]="carouselOptions.targetBlank ? '_blank' : null">
         <ng-container *ngTemplateOutlet="carouselContent"></ng-container>
       </a>
     </ng-container>

src/app/shared/carousel/carousel.component.spec.ts

@@ -35,6 +35,7 @@ import { createPaginatedList } from '../testing/utils.test';
 import { ItemSearchResult } from '../object-collection/shared/item-search-result.model';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
 import { CarouselOptions } from './carousel-options.model';
+import { InternalLinkService } from 'src/app/core/services/internal-link.service';
 
 describe('CarouselComponent', () => {
     let component: CarouselComponent;
@@ -168,6 +169,7 @@ describe('CarouselComponent', () => {
             providers: [
                 CarouselComponent,
                 { provide: ObjectCacheService, useValue: {} },
+                { provide: InternalLinkService, useValue: {} },
                 { provide: UUIDService, useValue: {} },
                 { provide: Store, useValue: {} },
                 { provide: RemoteDataBuildService, useValue: {} },

src/app/shared/carousel/carousel.component.ts

@@ -8,6 +8,7 @@ import {Bitstream} from '../../core/shared/bitstream.model';
 import {BitstreamDataService} from '../../core/data/bitstream-data.service';
 import {NativeWindowRef, NativeWindowService} from '../../core/services/window.service';
 import {getFirstCompletedRemoteData} from '../../core/shared/operators';
+import {InternalLinkService} from '../../core/services/internal-link.service';
 import {hasValue} from '../empty.util';
 import {ItemSearchResult} from '../object-collection/shared/item-search-result.model';
 import {followLink} from '../utils/follow-link-config.model';
@@ -82,6 +83,7 @@ export class CarouselComponent implements OnInit {
   isLoading$ = new BehaviorSubject(true);
 
   constructor(
+    public internalLinkService: InternalLinkService,
     protected bitstreamDataService: BitstreamDataService,
     @Inject(NativeWindowService) private _window: NativeWindowRef,
   ) {
@@ -157,10 +159,6 @@ export class CarouselComponent implements OnInit {
     return item.firstMetadataValue(this.link);
   }
 
-  isLinkInternal(link: string) {
-    return link.startsWith('/');
-  }
-
   /**
    * to open a link of an item
    */

src/app/shared/metric/metric-altmetric/metric-altmetric.component.ts

@@ -21,6 +21,7 @@ export class MetricAltmetricComponent extends BaseEmbeddedMetricComponent implem
     if (hasValue(this.metric.remark)) {
         this.remark = this.parseRemark();
     }
+    super.ngOnInit();
   }
 
   applyScript(): void {