[DSC-2887] fix: ok load page with query params, the resolver mis-validate the tab

Author: FrancescoMauto

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

@@ -136,19 +136,50 @@ describe('CrisItemPageTabResolver', () => {
           });
         });
 
-        it('Should handle tab shortnames with "::" correctly', () => {
-          const tabRD = createSuccessfulRemoteDataObject(createPaginatedList([{
+        it('Should handle tab shortnames with "::" correctly', (done) => {
+          const tabPageList = createPaginatedList([{
             ...tabPublicationsTest,
             shortname: 'publication::details',
-          }]));
-          tabService.findByItem.and.returnValue(createSuccessfulRemoteDataObject$(tabRD) as any);
+          }]);
+          const tabRD = createSuccessfulRemoteDataObject(tabPageList);
+          tabService.findByItem.and.returnValue(createSuccessfulRemoteDataObject$(tabPageList) as any);
 
-          TestBed.runInInjectionContext(() => {
-            return crisItemPageTabResolver({ params: { id: uuid } } as any, { url: '/entities/publication/1234-65487-12354-1235/publication::details' } as any);
+          const obs = TestBed.runInInjectionContext(() => {
+            return crisItemPageTabResolver({ params: { id: uuid } } as any, { url: '/entities/publication/1234-65487-12354-1235/details' } as any);
+          }) as Observable<RemoteData<PaginatedList<CrisLayoutTab>>>;
+
+          obs.pipe(take(1)).subscribe((resolved) => {
+            expect(router.navigateByUrl).not.toHaveBeenCalled();
+            expect(hardRedirectService.redirect).not.toHaveBeenCalled();
+            expect(resolved).toEqual(tabRD);
+            done();
           });
+        });
+
+        it('should NOT redirect to 404 when query params are present in the URL', (done) => {
+          const obs = TestBed.runInInjectionContext(() => {
+            return crisItemPageTabResolver({ params: { id: uuid } } as any, { url: '/entities/publication/1234-65487-12354-1235?f.subject=value&f.date=2024' } as any);
+          }) as Observable<RemoteData<PaginatedList<CrisLayoutTab>>>;
 
-          expect(router.navigateByUrl).not.toHaveBeenCalled();
-          expect(hardRedirectService.redirect).not.toHaveBeenCalled();
+          obs.pipe(take(1)).subscribe((resolved) => {
+            expect(router.navigateByUrl).not.toHaveBeenCalled();
+            expect(hardRedirectService.redirect).not.toHaveBeenCalled();
+            expect(resolved).toEqual(tabsRD);
+            done();
+          });
+        });
+
+        it('should NOT redirect to 404 when query params are present with a valid tab', (done) => {
+          const obs = TestBed.runInInjectionContext(() => {
+            return crisItemPageTabResolver({ params: { id: uuid } } as any, { url: '/entities/publication/1234-65487-12354-1235/details?f.subject=value' } as any);
+          }) as Observable<RemoteData<PaginatedList<CrisLayoutTab>>>;
+
+          obs.pipe(take(1)).subscribe((resolved) => {
+            expect(router.navigateByUrl).not.toHaveBeenCalled();
+            expect(hardRedirectService.redirect).not.toHaveBeenCalled();
+            expect(resolved).toEqual(tabsRD);
+            done();
+          });
         });
       });
 

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

@@ -55,17 +55,19 @@ export const crisItemPageTabResolver: ResolveFn<RemoteData<PaginatedList<CrisLay
         ).pipe(
           getFirstCompletedRemoteData(),
           map((tabsRD: RemoteData<PaginatedList<CrisLayoutTab>>) => {
-            if (tabsRD.hasSucceeded && tabsRD?.payload?.page?.length > 0) {
-              // By splitting the url with uuid we can understand if the item is primary item page or a tab
-              const urlSplit = state.url.split(route.params.id);
-              const givenTab = urlSplit[1];
-              const itemPageRoute = getItemPageRoute(itemRD.payload);
+              if (tabsRD.hasSucceeded && tabsRD?.payload?.page?.length > 0) {
+                // By splitting the url with uuid we can understand if the item is primary item page or a tab
+                const urlWithoutQuery = state.url.split('?')[0];
+                const urlSplit = urlWithoutQuery.split(route.params.id);
+                const tabArguments = urlSplit[1]?.split('/');
+                const givenTab = tabArguments?.[1];
+                const itemPageRoute = getItemPageRoute(itemRD.payload);
 
-              const isValidTab = !givenTab || tabsRD.payload.page.some((tab) => {
-                const shortnameSplit = tab.shortname.split('::');
-                const shortname = shortnameSplit[shortnameSplit.length - 1];
-                return `/${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]
@@ -74,7 +76,7 @@ export const crisItemPageTabResolver: ResolveFn<RemoteData<PaginatedList<CrisLay
               if (!isValidTab) {
                 // If wrong tab is given redirect to 404 page
                 router.navigateByUrl(getPageNotFoundRoute(), { skipLocationChange: true, replaceUrl: false });
-              } else if (givenTab === `/${mainTab.shortname}`) {
+              } else if (givenTab === mainTab.shortname) {
                 if (isPlatformServer(platformId)) {
                   // If first tab is given redirect to root item page
                   hardRedirectService.redirect(itemPageRoute, 302);