Merged in task/dspace-cris-2023_02_x/DSC-2241 (pull request DSpace#3068)

[DSC-2241] Fix issue with signposting resolver when item has custom url

Approved-by: Vincenzo Mecca

Author: atarix83

src/app/item-page/simple/link-resolver/signposting-links.resolver.spec.ts

@@ -3,10 +3,16 @@ import { SignpostingDataService } from '../../../core/data/signposting-data.serv
 import { of } from 'rxjs';
 import { TestBed } from '@angular/core/testing';
 import { signpostingLinksResolver } from './signposting-links.resolver';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { Item } from '../../../core/shared/item.model';
+import { MetadataMap } from '../../../core/shared/metadata.models';
+
 describe('signpostingLinksResolver', () => {
   let resolver: any;
   let route: ActivatedRouteSnapshot;
   let state = {};
+  let itemDataService: ItemDataService;
   let signpostingDataService: SignpostingDataService;
   const testUuid = '1234567890';
   const mocklink = {
@@ -24,12 +30,19 @@ describe('signpostingLinksResolver', () => {
     href: 'http://test2.org',
     rel: 'rel2',
   };
+  const mockItem = Object.assign(new Item(), {
+    uuid: testUuid,
+    metadata: new MetadataMap()
+  });
   function init() {
     route = Object.assign(new ActivatedRouteSnapshot(), {
       params: {
         id: testUuid,
       },
     });
+    itemDataService = jasmine.createSpyObj('itemDataService', {
+      findById: createSuccessfulRemoteDataObject$(mockItem)
+    });
     signpostingDataService = jasmine.createSpyObj('signpostingDataService', {
       getLinks: of([mocklink, mocklink2]),
       setLinks: () => null,
@@ -41,6 +54,7 @@ describe('signpostingLinksResolver', () => {
       providers: [
         {provide: RouterStateSnapshot, useValue: state},
         {provide: ActivatedRouteSnapshot, useValue: route},
+        {provide: ItemDataService, useValue: itemDataService},
         {provide: SignpostingDataService, useValue: signpostingDataService},
       ]
     });

src/app/item-page/simple/link-resolver/signposting-links.resolver.ts

@@ -1,25 +1,37 @@
 import { ActivatedRouteSnapshot, ResolveFn, RouterStateSnapshot } from '@angular/router';
 import { SignpostingLink } from '../../../core/data/signposting-links.model';
-import { Observable, of } from 'rxjs';
+import { Observable, of, switchMap } from 'rxjs';
 import { inject } from '@angular/core';
 import { hasValue } from '../../../shared/empty.util';
 import { SignpostingDataService } from '../../../core/data/signposting-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
+import { getItemPageLinksToFollow } from '../../item.resolver';
 
 /**
  * Resolver to retrieve signposting links before an eventual redirect of any route guard
  *
  * @param route
  * @param state
+ * @param itemService
  * @param signpostingDataService
  */
 export const signpostingLinksResolver: ResolveFn<Observable<SignpostingLink[]>> = (
   route: ActivatedRouteSnapshot,
   state: RouterStateSnapshot,
+  itemService: ItemDataService = inject(ItemDataService),
   signpostingDataService: SignpostingDataService = inject(SignpostingDataService),
 ): Observable<SignpostingLink[]> => {
   const uuid = route.params.id;
   if (!hasValue(uuid)) {
     return of([]);
   }
-  return signpostingDataService.getLinks(uuid);
+  return itemService.findById(uuid, true, true, ...getItemPageLinksToFollow(),).pipe(
+    getFirstCompletedRemoteData(),
+    switchMap((itemRD: RemoteData<Item>) => {
+      return itemRD.hasSucceeded ? signpostingDataService.getLinks(itemRD.payload.uuid) : of([]);
+    }),
+  );
 };