Merge branch 'w2p-112565_FixNavigationIssueOnItemEntityRedirect_contr…

…ibute-7.6' into w2p-112565_FixNavigationIssueOnItemEntityRedirect_contribute-main
atmire · Feb 29, 2024 · 240d16a · 240d16a
2 parents ff05094 + fcec99a
commit 240d16a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/app/item-page/item-page.resolver.spec.ts b/src/app/item-page/item-page.resolver.spec.ts
@@ -52,7 +52,7 @@ describe('ItemPageResolver', () => {
           .pipe(first())
           .subscribe(
             () => {
-              expect(router.navigateByUrl).toHaveBeenCalledWith(router.parseUrl(`/entities/${entityType}/${uuid}`).toString());
+              expect(router.navigateByUrl).toHaveBeenCalledWith(router.parseUrl(`/entities/${entityType}/${uuid}`).toString(), { replaceUrl: true });
               done();
             }
           );

diff --git a/src/app/item-page/item-page.resolver.ts b/src/app/item-page/item-page.resolver.ts
@@ -46,7 +46,7 @@ export class ItemPageResolver extends ItemResolver {
           if (!thisRoute.startsWith(itemRoute)) {
             const itemId = rd.payload.uuid;
             const subRoute = thisRoute.substring(thisRoute.indexOf(itemId) + itemId.length, thisRoute.length);
-            this.router.navigateByUrl(itemRoute + subRoute);
+            this.router.navigateByUrl(itemRoute + subRoute, { replaceUrl: true });
           }
         }
         return rd;