From 31f3c96ad767ec1f3932102fb52af4de87ed013c Mon Sep 17 00:00:00 2001
From: Brion Mario <info@brionmario.com>
Date: Mon, 18 Jan 2021 19:41:03 +0530
Subject: [PATCH] Fix route not selecting issues

---
 apps/console/src/views/admin.tsx     | 12 ++++++++++++
 apps/console/src/views/developer.tsx | 10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/apps/console/src/views/admin.tsx b/apps/console/src/views/admin.tsx
index f107e0cd610..79fee1a2af6 100644
--- a/apps/console/src/views/admin.tsx
+++ b/apps/console/src/views/admin.tsx
@@ -120,6 +120,18 @@ export const AdminView: FunctionComponent<AdminViewPropsInterface> = (
     const [ mobileSidePanelVisibility, setMobileSidePanelVisibility ] = useState<boolean>(false);
     const [ isMobileViewport, setIsMobileViewport ] = useState<boolean>(false);
 
+    /**
+     * Listen to location changes and set the active route accordingly.
+     */
+    useEffect(() => {
+
+        if (isEmpty(filteredRoutes) || !location?.pathname) {
+            return;
+        }
+
+        setSelectedRoute(CommonRouteUtils.getInitialActiveRoute(location.pathname, filteredRoutes));
+    }, [ location?.pathname, filteredRoutes ]);
+
     useEffect(() => {
         setSelectedRoute(CommonRouteUtils.getInitialActiveRoute(location.pathname, filteredRoutes));
         
diff --git a/apps/console/src/views/developer.tsx b/apps/console/src/views/developer.tsx
index 273cd21cdd4..84ac6681486 100644
--- a/apps/console/src/views/developer.tsx
+++ b/apps/console/src/views/developer.tsx
@@ -109,9 +109,17 @@ export const DeveloperView: FunctionComponent<DeveloperViewPropsInterface> = (
     const [ mobileSidePanelVisibility, setMobileSidePanelVisibility ] = useState<boolean>(false);
     const [ isMobileViewport, setIsMobileViewport ] = useState<boolean>(false);
 
+    /**
+     * Listen to location changes and set the active route accordingly.
+     */
     useEffect(() => {
+
+        if (isEmpty(filteredRoutes) || !location?.pathname) {
+            return;
+        }
+
         setSelectedRoute(CommonRouteUtils.getInitialActiveRoute(location.pathname, filteredRoutes));
-    }, [ filteredRoutes ]);
+    }, [ location?.pathname, filteredRoutes ]);
 
     useEffect(() => {