Fix route not selecting issues

jenkins-is-staging · Jan 18, 2021 · 31f3c96 · 31f3c96
1 parent 05ee7f4
commit 31f3c96
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git 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
@@ -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(() => {