From 2c2e248c956143352ef0bc791eba443b236062d8 Mon Sep 17 00:00:00 2001
From: Vikrant Gupta <vikrant.thomso@gmail.com>
Date: Fri, 20 Dec 2024 17:37:44 +0530
Subject: [PATCH] fix: add support route to the base route for private routes
 (#6688)

* fix: add support route to the base route for private routes

* fix: early return from useEffect if it's an old route

* fix: same old explorer routes in old mapping
---
 frontend/src/AppRoutes/Private.tsx | 4 +++-
 frontend/src/AppRoutes/routes.ts   | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/AppRoutes/Private.tsx b/frontend/src/AppRoutes/Private.tsx
index 77bacc6728..c689786fcc 100644
--- a/frontend/src/AppRoutes/Private.tsx
+++ b/frontend/src/AppRoutes/Private.tsx
@@ -18,6 +18,7 @@ import routes, {
 	LIST_LICENSES,
 	oldNewRoutesMapping,
 	oldRoutes,
+	SUPPORT_ROUTE,
 } from './routes';
 
 function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
@@ -37,7 +38,7 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 	const mapRoutes = useMemo(
 		() =>
 			new Map(
-				[...routes, LIST_LICENSES].map((e) => {
+				[...routes, LIST_LICENSES, SUPPORT_ROUTE].map((e) => {
 					const currentPath = matchPath(pathname, {
 						path: e.path,
 					});
@@ -160,6 +161,7 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 				pathname: redirectUrl,
 			};
 			history.replace(newLocation);
+			return;
 		}
 		// if the current route
 		if (currentRoute) {
diff --git a/frontend/src/AppRoutes/routes.ts b/frontend/src/AppRoutes/routes.ts
index dbe0fc6be4..f1490ec74e 100644
--- a/frontend/src/AppRoutes/routes.ts
+++ b/frontend/src/AppRoutes/routes.ts
@@ -427,7 +427,6 @@ export const LIST_LICENSES: AppRoutes = {
 
 export const oldRoutes = [
 	'/pipelines',
-	'/logs/old-logs-explorer',
 	'/logs-explorer',
 	'/logs-explorer/live',
 	'/logs-save-views',
@@ -437,7 +436,6 @@ export const oldRoutes = [
 
 export const oldNewRoutesMapping: Record<string, string> = {
 	'/pipelines': '/logs/pipelines',
-	'/logs/old-logs-explorer': '/logs/old-logs-explorer',
 	'/logs-explorer': '/logs/logs-explorer',
 	'/logs-explorer/live': '/logs/logs-explorer/live',
 	'/logs-save-views': '/logs/saved-views',