Merged in task/dspace-cris-2024_02_x/DSC-2469 (pull request DSpace#3520)

[DSC-2469] add fix for custom url edit page, adapt loading

Approved-by: Andrea Barbasso

Author: FrancescoMolinaro

src/app/app.component.spec.ts

@@ -71,6 +71,7 @@ const initialState = {
 };
 
 const itemPageUrl = '/entities/publication/3b6ef8e8-15a1-4607-abf8-2a6fbd572346';
+const itemPageCustomUrl = '/entities/publication/aCustomUrl';
 
 export function getMockLocaleService(): LocaleService {
   return jasmine.createSpyObj('LocaleService', {
@@ -206,6 +207,14 @@ describe('App component', () => {
       expect(comp.isRouteLoading$.value).toBeTrue();
     }));
 
+    it('should show loading for item page administrative edit if custom url is used', fakeAsync(() => {
+      routeServiceMock.getCurrentUrl.and.returnValue(of(itemPageCustomUrl));
+      routerEventsObs.next(new NavigationStart(2, itemPageCustomUrl + '/edit'));
+      fixture.detectChanges();
+      tick();
+      expect(comp.isRouteLoading$.value).toBeTrue();
+    }));
+
     it('should not show loading navigating between item pages in administrative edit', fakeAsync(() => {
       routeServiceMock.getCurrentUrl.and.returnValue(of(itemPageUrl + '/edit'));
       routerEventsObs.next(new NavigationStart(2, itemPageUrl + '/edit/status'));

src/app/app.component.ts

@@ -224,7 +224,7 @@ export class AppComponent implements OnInit, AfterViewInit {
   }
 
   private isAdministrativeEditItemPageRoute(nextUrl: string, currentUrl: string): boolean {
-    const editPageRegEx = /\/(entities\/[^\/]+|items)\/[0-9a-f-]{36}\/edit(?:\/.*)?$/;
+    const editPageRegEx = /\/(entities\/[^/]+|items)\/[^/]+\/edit(?:\/.*)?$/;
     return editPageRegEx.test(nextUrl) && !editPageRegEx.test(currentUrl);
   }
 

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

@@ -75,7 +75,8 @@ 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();
+        const isItemEditPage = state.url.includes('/edit');
+        const itemRoute = isItemEditPage ? state.url : 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) {