From 5e32089450e6b6e231786c8f6baf759b2e9af297 Mon Sep 17 00:00:00 2001 From: Alessandro Menduni Date: Wed, 26 Oct 2022 16:02:06 +0200 Subject: [PATCH] Fix sidebar activeHref not being set on full page reload --- frontend/src/components/SideBar.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/SideBar.tsx b/frontend/src/components/SideBar.tsx index 62d71310..416c1eff 100644 --- a/frontend/src/components/SideBar.tsx +++ b/frontend/src/components/SideBar.tsx @@ -13,16 +13,14 @@ import * as React from 'react' import {useTranslation} from 'react-i18next' import {useLocation, useNavigate} from 'react-router-dom' import {USER_ROLES_CLAIM} from '../auth/constants' -import {isAdmin, isGuest, isUser, useState} from '../store' +import {isAdmin, isUser, useState} from '../store' export default function SideBar() { const {t} = useTranslation() const navigate = useNavigate() const location = useLocation() - const defaultPage = isGuest() ? '/home' : '/clusters' - const currentHref = '/' + location.pathname.split('/')?.[1] - const [activeHref, setActiveHref] = React.useState(currentHref || defaultPage) + const activeHref = '/' + location.pathname.split('/')?.[1] const identity = useState(['identity', USER_ROLES_CLAIM]) const header = React.useMemo( @@ -73,7 +71,6 @@ export default function SideBar() { event => { if (!event.detail.external) { event.preventDefault() - setActiveHref(event.detail.href) navigate(event.detail.href) } },