From 694d45fd2c9b8982217d5d2c124864eb42702685 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Fri, 22 Jan 2021 17:07:15 +0100
Subject: [PATCH] 75939: Encode and lowercase entity type url

---
 src/app/+item-page/item-page-routing-paths.ts       | 2 +-
 src/app/core/data/dso-redirect-data.service.spec.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/+item-page/item-page-routing-paths.ts b/src/app/+item-page/item-page-routing-paths.ts
index 0cf6907ac2..b153f53c26 100644
--- a/src/app/+item-page/item-page-routing-paths.ts
+++ b/src/app/+item-page/item-page-routing-paths.ts
@@ -24,7 +24,7 @@ export function getItemEditRoute(item: Item) {
 
 export function getEntityPageRoute(entityType: string, itemId: string) {
   if (isNotEmpty(entityType)) {
-    return new URLCombiner('/entities', entityType, itemId).toString();
+    return new URLCombiner('/entities', encodeURIComponent(entityType.toLowerCase()), itemId).toString();
   } else {
     return new URLCombiner(getItemModuleRoute(), itemId).toString();
   }
diff --git a/src/app/core/data/dso-redirect-data.service.spec.ts b/src/app/core/data/dso-redirect-data.service.spec.ts
index 574920746f..43489fbf6d 100644
--- a/src/app/core/data/dso-redirect-data.service.spec.ts
+++ b/src/app/core/data/dso-redirect-data.service.spec.ts
@@ -132,7 +132,7 @@ describe('DsoRedirectDataService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(router.navigate).toHaveBeenCalledWith(['/entities/Publication/' + remoteData.payload.uuid]);
+      expect(router.navigate).toHaveBeenCalledWith(['/entities/publication/' + remoteData.payload.uuid]);
     });
 
     it('should navigate to collections route', () => {