Merged in task/main-cris/DSC-2269 (pull request DSpace#3086)

[DSC-2269] fix link resolution

Approved-by: Andrea Barbasso
Approved-by: Giuseppe Digilio

Author: FrancescoMolinaro

src/app/item-page/item-page.resolver.ts

@@ -75,10 +75,11 @@ export const itemPageResolver: ResolveFn<RemoteData<Item>> = (
     map((rd: RemoteData<Item>) => {
       store.dispatch(new ResolvedAction(state.url, rd.payload));
       if (rd.hasSucceeded && hasValue(rd.payload)) {
+        const itemRoute = router.parseUrl(getItemPageRoute(rd.payload)).toString();
         // Check if custom url not empty and if the current id parameter is different from the custom url redirect to custom url
         if (hasValue(rd.payload.metadata) && isNotEmpty(rd.payload.metadata['cris.customurl'])) {
           if (route.params.id !== rd.payload.metadata['cris.customurl'][0].value) {
-            const newUrl = state.url.replace(route.params.id, rd.payload.metadata['cris.customurl'][0].value);
+            const newUrl = itemRoute.replace(route.params.id, rd.payload.metadata['cris.customurl'][0].value);
             router.navigateByUrl(newUrl);
           }
         } else {
@@ -88,7 +89,6 @@ export const itemPageResolver: ResolveFn<RemoteData<Item>> = (
           // or semicolons) and thisRoute has been encoded with that function. If we want to compare
           // it with itemRoute, we have to run itemRoute through Angular's version as well to ensure
           // the same characters are encoded the same way.
-          const itemRoute = router.parseUrl(getItemPageRoute(rd.payload)).toString();
 
           if (!thisRoute.startsWith(itemRoute)) {
             const itemId = rd.payload.uuid;

src/app/shared/metadata-link-view/metadata-link-view.component.html

@@ -10,7 +10,7 @@
         container="body"
         triggers="mouseenter">
     <a rel="noopener noreferrer" data-test="linkToAuthority"
-      [routerLink]="['/items/' + metadataView.authority]">
+      [routerLink]="[relatedDsoRoute]">
       <span dsEntityIcon
             [iconPosition]="iconPosition"
             [entityType]="metadataView.entityType"

src/app/shared/metadata-link-view/metadata-link-view.component.ts

@@ -22,6 +22,7 @@ import {
   switchMap,
   take,
 } from 'rxjs/operators';
+import { getItemPageRoute } from 'src/app/item-page/item-page-routing-paths';
 
 import { environment } from '../../../environments/environment';
 import { ItemDataService } from '../../core/data/item-data.service';
@@ -97,6 +98,11 @@ export class MetadataLinkViewComponent implements OnInit {
    */
   relatedItem: Item;
 
+  /**
+   * Route of related item page
+   */
+  relatedDsoRoute: string;
+
   /**
    * Map all entities with the icons specified in the environment configuration file
    */
@@ -149,6 +155,7 @@ export class MetadataLinkViewComponent implements OnInit {
   private createMetadataView(itemRD: RemoteData<Item>, metadataValue: MetadataValue): MetadataView {
     if (itemRD.hasSucceeded) {
       this.relatedItem = itemRD.payload;
+      this.relatedDsoRoute = this.getItemPageRoute(this.relatedItem);
       const entityStyleValue = this.getCrisRefMetadata(itemRD.payload?.entityType);
       return {
         authority: metadataValue.authority,
@@ -207,4 +214,8 @@ export class MetadataLinkViewComponent implements OnInit {
     return metadata ?? this.crisRefMetadata?.default;
   }
 
+  getItemPageRoute(item: Item): string {
+    return getItemPageRoute(item);
+  }
+
 }