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

[DSC-2267] fix nested tab validation

Approved-by: Giuseppe Digilio

Author: Andrea Barbasso

src/app/item-page/cris-item-page-tab.resolver.spec.ts

@@ -9,7 +9,7 @@ import { HardRedirectService } from '../core/services/hard-redirect.service';
 import { CrisItemPageTabResolver } from './cris-item-page-tab.resolver';
 import { TabDataService } from '../core/layout/tab-data.service';
 import { createPaginatedList } from '../shared/testing/utils.test';
-import { tabDetailsTest, tabPublicationsTest } from '../shared/testing/layout-tab.mocks';
+import { tabDetailsTest, tabFundingsTest, tabPublicationsTest, } from '../shared/testing/layout-tab.mocks';
 import { PLATFORM_ID } from '@angular/core';
 
 describe('CrisItemPageTabResolver', () => {
@@ -48,8 +48,8 @@ describe('CrisItemPageTabResolver', () => {
       }
     });
 
-    const tabsRD = createSuccessfulRemoteDataObject(createPaginatedList([tabPublicationsTest, tabDetailsTest]));
-    const tabsRD$ = createSuccessfulRemoteDataObject$(createPaginatedList([tabPublicationsTest, tabDetailsTest]));
+  const tabsRD = createSuccessfulRemoteDataObject(createPaginatedList([tabPublicationsTest, tabDetailsTest, tabFundingsTest]));
+  const tabsRD$ = createSuccessfulRemoteDataObject$(createPaginatedList([tabPublicationsTest, tabDetailsTest, tabFundingsTest]));
 
     const noTabsRD = createSuccessfulRemoteDataObject(createPaginatedList([]));
     const noTabsRD$ = createSuccessfulRemoteDataObject$(createPaginatedList([]));
@@ -128,6 +128,18 @@ describe('CrisItemPageTabResolver', () => {
               }
             );
         });
+
+      it('Should handle tab shortnames with "::" correctly', () => {
+        const tabRD = createSuccessfulRemoteDataObject(createPaginatedList([{ ...tabPublicationsTest, shortname: 'publication::details' }]));
+        tabService.findByItem.and.returnValue(createSuccessfulRemoteDataObject$(tabRD) as any);
+
+        TestBed.runInInjectionContext(() => {
+          return resolver.resolve({ params: { id: uuid } } as any, { url: '/entities/publication/1234-65487-12354-1235/publication::details' } as any);
+        });
+
+        expect(router.navigateByUrl).not.toHaveBeenCalled();
+        expect(hardRedirectService.redirect).not.toHaveBeenCalled();
+      });
       });
 
       describe('when platform is server', () => {

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

@@ -55,7 +55,12 @@ export class CrisItemPageTabResolver implements Resolve<RemoteData<PaginatedList
                 const urlSplit = state.url.split(route.params.id);
                 const givenTab = urlSplit[1];
                 const itemPageRoute = getItemPageRoute(itemRD.payload);
-                const isValidTab = tabsRD.payload.page.some((tab) => !givenTab || `/${tab.shortname}` === givenTab);
+
+                const isValidTab = !givenTab || tabsRD.payload.page.some((tab) => {
+                  const shortnameSplit = tab.shortname.split('::');
+                  const shortname = shortnameSplit[shortnameSplit.length - 1];
+                  return `/${shortname}` === givenTab;
+                });
 
                 const mainTab = tabsRD.payload.page.length === 1
                   ? tabsRD.payload.page[0]

src/app/shared/testing/layout-tab.mocks.ts

@@ -1050,4 +1050,19 @@ export const tabPeoplesTest: CrisLayoutTab = {
     }
   }
 };
+export const tabFundingsTest: CrisLayoutTab = {
+  'id': 395,
+  'shortname': 'outputs::fundings',
+  'header': 'Fundings',
+  'entityType': 'OrgUnit',
+  'priority': 0,
+  'security': 0,
+  'type': TAB,
+  'uuid': '123123123123',
+  '_links': {
+    'self': {
+      'href': 'http://localhost:8080/server/api/layout/tabs/401',
+    },
+  },
+};
 export const tabsWithNestedLevel = [tabDetailsTest, tabPublicationsTest, tabRpPublicationsTest, tabProjectsTest, tabRpProjectsTest, tabPeoplesTest];