Skip to content

fix(ws): Expose active nav item on initial Workspaces page load #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2025
Merged

fix(ws): Expose active nav item on initial Workspaces page load #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions workspaces/frontend/src/app/AppRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Route, Routes } from 'react-router-dom';
import { Route, Routes, Navigate } from 'react-router-dom';
import { AppRoutePaths } from '~/app/routes';
import { WorkspaceForm } from '~/app/pages/Workspaces/Form/WorkspaceForm';
import { NotFound } from './pages/notFound/NotFound';
Expand Down Expand Up @@ -64,7 +64,7 @@ const AppRoutes: React.FC = () => {
<Route path={AppRoutePaths.workspaceEdit} element={<WorkspaceForm />} />
<Route path={AppRoutePaths.workspaces} element={<Workspaces />} />
<Route path={AppRoutePaths.workspaceKinds} element={<WorkspaceKinds />} />
<Route path="/" element={<Workspaces />} />
<Route path="/" element={<Navigate to={AppRoutePaths.workspaces} replace />} />
<Route path="*" element={<NotFound />} />
{
// TODO: Remove the linter skip when we implement authentication
Expand Down
23 changes: 15 additions & 8 deletions workspaces/frontend/src/app/NavSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { NavLink } from 'react-router-dom';
import { NavLink, useLocation } from 'react-router-dom';
import {
Brand,
Nav,
Expand All @@ -12,13 +12,20 @@ import {
import { useNavData, isNavDataGroup, NavDataHref, NavDataGroup } from './AppRoutes';
import { isMUITheme, LOGO_LIGHT } from './const';

const NavHref: React.FC<{ item: NavDataHref }> = ({ item }) => (
<NavItem key={item.label} data-id={item.label} itemId={item.label}>
<NavLink to={item.path} data-testid={`nav-link-${item.path}`}>
{item.label}
</NavLink>
</NavItem>
);
const NavHref: React.FC<{ item: NavDataHref }> = ({ item }) => {
const location = useLocation();

// With the redirect in place, we can now use a simple path comparison.
const isActive = location.pathname === item.path;

return (
<NavItem isActive={isActive} key={item.label} data-id={item.label} itemId={item.label}>
<NavLink to={item.path} data-testid={`nav-link-${item.path}`}>
{item.label}
</NavLink>
</NavItem>
);
};

const NavGroup: React.FC<{ item: NavDataGroup }> = ({ item }) => {
const { children } = item;
Expand Down
6 changes: 3 additions & 3 deletions workspaces/frontend/src/shared/style/MUI-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,10 +543,10 @@
--pf-v6-c-nav__link--hover--Color: var(--kf-central-sidebar-default-color);
--pf-v6-c-nav__link--FontSize: var(--pf-t--global--font--size--md);

&.active {
&.pf-m-current {
border-left: 3px solid var(--mui-palette-common-white);
--pf-v6-c-nav__link--Color: var(--mui-palette-common-white);
--pf-v6-c-nav__link--hover--Color: var(--mui-palette-common-white);
--pf-v6-c-nav__link--m-current--BackgroundColor: #ffffff1b;
--pf-v6-c-nav__link--m-current--Color: var(--mui-palette-common-white);
}

&.pf-v6-c-brand {
Expand Down